Yaltik/golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[REF]GOLEM Activity Registration Payment

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-11-01 17:55:38 +01:00
parent 41cd2e863a
commit c8ccf3e4fa
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_activity_registration_payment/__manifest__.py
View File

@ -20,7 +20,7 @@
'name': 'GOLEM Activity Member Registration Payments', 'name': 'GOLEM Activity Member Registration Payments',
'summary': 'GOLEM Activities Member Registration Payments', 'summary': 'GOLEM Activities Member Registration Payments',
'description': 'GOLEM Activities Member Registration Payments', 'description': 'GOLEM Activities Member Registration Payments',
'version': '10.0.0.5.0', 'version': '10.0.0.6.0',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois', 'author': 'Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

9
golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
View File

@ -51,10 +51,9 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
ondelete='cascade') ondelete='cascade')
member_id = fields.Many2one('golem.member', 'Member', required=True, member_id = fields.Many2one('golem.member', 'Member', required=True,
ondelete='cascade') ondelete='cascade')
partner_ids = fields.Many2many('res.partner', compute='_compute_partner_ids') guardian_ids = fields.Many2many('res.partner', compute='_compute_guardian_ids')
on_the_name_of = fields.Many2one('res.partner', 'On the Name of', on_the_name_of = fields.Many2one('res.partner', 'On the Name of',
ondelete='cascade', ondelete='cascade')
domain="[('id', '=', partner_ids[0][2])]")
is_minor = fields.Boolean(related='member_id.is_minor') is_minor = fields.Boolean(related='member_id.is_minor')
line_ids = fields.One2many('golem.activity.registration.invoicing.line', line_ids = fields.One2many('golem.activity.registration.invoicing.line',
'invoicing_id', string='Activities') 'invoicing_id', string='Activities')
@ -72,13 +71,13 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
payment_ids = fields.Many2many('account.payment', string='Generated payments') payment_ids = fields.Many2many('account.payment', string='Generated payments')
@api.depends('member_id') @api.depends('member_id')
def _compute_partner_ids(self): def _compute_guardian_ids(self):
for rec in self: for rec in self:
partner_ids = rec.member_id.legal_guardian_ids.mapped('legal_guardian_id').ids partner_ids = rec.member_id.legal_guardian_ids.mapped('legal_guardian_id').ids
if hasattr(rec.member_id, 'family_member_ids'): if hasattr(rec.member_id, 'family_member_ids'):
partner_ids += rec.member_id.family_member_ids.filtered( partner_ids += rec.member_id.family_member_ids.filtered(
lambda r: r.id != self.member_id.partner_id.id).ids lambda r: r.id != self.member_id.partner_id.id).ids
rec.partner_ids = [(6, 0, partner_ids)] rec.guardian_ids = [(6, 0, partner_ids)]
def _create_invoice_line(self, product, price, invoice): def _create_invoice_line(self, product, price, invoice):
""" Create invoice line : needs cache record for onchange, then real """ Create invoice line : needs cache record for onchange, then real

12
golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
View File

@ -33,11 +33,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<group states="init"> <group states="init">
<group name="lines" colspan="2"> <group name="lines" colspan="2">
<field name="season_id" readonly="1" /> <field name="season_id" readonly="1" />
<field name="member_id"/><!-- readonly="1" />--> <field name="member_id" readonly="0" />
<field name='on_the_name_of' attrs="{'invisible': [('is_minor', '=', False)]}" <field name="on_the_name_of"
options="{'no_create': True}"/> attrs="{'invisible': [('is_minor', '=', False)], 'required': [('is_minor', '=', True)]}"
<field name='is_minor' invisible='1'/> options="{'no_create': True}"
<field name="partner_ids" invisible='1'/> domain="[('id', 'in', guardian_ids[0][2])]" />
<field name="is_minor" invisible="1" />
<field name="guardian_ids" invisible="1" widget="many2many_tags" />
<field name="line_ids" string="Activities and Prices"> <field name="line_ids" string="Activities and Prices">
<tree delete="false" create="false" edit="true" editable="bottom"> <tree delete="false" create="false" edit="true" editable="bottom">
<field name="activity_id" readonly="1" /> <field name="activity_id" readonly="1" />