diff --git a/models/res_partner.py b/models/res_partner.py index fbb3047d253a51a6c61b5fc7a834a3b9045d06bf..3125436c572787baccfd7c46d63809ebf640e2e9 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -601,6 +601,7 @@ class ScopPartner(models.Model): 'state_id': partner.state_id.id, 'country_id': partner.country_id.id, 'naf_id': partner.naf_id.id, + 'ur_id': partner.ur_id.id, 'cae': partner.cae }) partner.scop_period_ids = new_period diff --git a/models/scop_period.py b/models/scop_period.py index 107299e30bbe5de420fae8f243d18eb536b81e80..65043ddb2152ed0d33473bec8adda3da4eb2ba64 100644 --- a/models/scop_period.py +++ b/models/scop_period.py @@ -59,6 +59,9 @@ class ScopPeriod(models.Model): 'res.partner.naf', string='Code NAF', on_delete='restrict') + ur_id = fields.Many2one( + comodel_name='union.regionale', + string='Union Régionale') cae = fields.Boolean("CAE") dissolution_reason_id = fields.Many2one( 'res.partner.dissolution.reason', @@ -70,7 +73,6 @@ class ScopPeriod(models.Model): related='partner_id.member_number', store=False) - # ------------------------------------------------------ # Override ORM # ------------------------------------------------------ diff --git a/views/res_partner.xml b/views/res_partner.xml index a6ab78075e998f7964d35076367a549ecc02e920..580588bcd5e90c6add5bf851117fedf796ebd911 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -399,7 +399,7 @@ <field name="id_riga" groups="cgscop_partner.group_cg_administrator"/> </group> <group string="Suivi UR"> - <field name="ur_id" required="True" options="{'no_open': True, 'no_create': True}"/> + <field name="ur_id" readonly="1" options="{'no_open': True, 'no_create': True}"/> <field name="creation_delegate_id" attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '5_cg'))], 'invisible':[('project_status', 'in', '6_suivi')]}" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/> <field name="followup_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/> @@ -656,6 +656,7 @@ <field name="state_id" invisible="1"/> <field name="country_id" invisible="1"/> <field name="naf_id"/> + <field name="ur_id"/> <field name="cae"/> </tree> </field> diff --git a/views/scop_period_views.xml b/views/scop_period_views.xml index 28c118490dd9d2822edd30a486de2c878c988e67..d6712aeaf8dc04002b97f7905cfadd78b09fde15 100644 --- a/views/scop_period_views.xml +++ b/views/scop_period_views.xml @@ -44,6 +44,7 @@ <field name="state_id" invisible="1"/> <field name="country_id" invisible="1"/> <field name="naf_id" options="{'no_open': True, 'no_create': True}"/> + <field name="ur_id" options="{'no_open': True, 'no_create': True}"/> <field name="cae"/> </tree> </field> diff --git a/wizard/scop_address_wizard.py b/wizard/scop_address_wizard.py index 60ae4f49595dc14a6d08726471c634b0f59e4fd8..8fa6b753f4707ada43395caee710c47c46f8868d 100644 --- a/wizard/scop_address_wizard.py +++ b/wizard/scop_address_wizard.py @@ -96,6 +96,11 @@ class ScopPeriodWizard(models.TransientModel): return self.env['res.partner'].browse( self.env.context.get('active_id')).cae + @api.model + def _default_ur_id(self): + return self.env['res.partner'].browse( + self.env.context.get('active_id')).ur_id + # Fields common partner_id = fields.Integer('Partner', default=_default_partner_id) @@ -151,7 +156,10 @@ class ScopPeriodWizard(models.TransientModel): string='Code NAF', on_delete='restrict', default=_default_naf_id) cae = fields.Boolean("CAE", default=_default_cae) - + ur_id = fields.Many2one( + comodel_name='union.regionale', + string='Union Régionale', + default=_default_ur_id) # Action @api.onchange('zip_id') @@ -228,7 +236,8 @@ class ScopPeriodWizard(models.TransientModel): 'state_id': period.state_id.id, 'country_id': period.country_id.id, 'naf_id': period.naf_id.id, - 'cae': period.cae + 'cae': period.cae, + 'ur_id': period.ur_id.id, } period_values.update(values) self.env['scop.period'].sudo().create(period_values) @@ -245,5 +254,6 @@ class ScopPeriodWizard(models.TransientModel): 'cedex': period.cedex, 'state_id': period.state_id.id, 'country_id': period.country_id.id, + 'ur_id': period.ur_id.id, }) partner.write(partner_values) diff --git a/wizard/scop_address_wizard.xml b/wizard/scop_address_wizard.xml index a27f4d67b881ecf20dc2b5fdb81aa55c7a8a3b02..a95d9f2c18ad552286398d03027206bd73e82358 100644 --- a/wizard/scop_address_wizard.xml +++ b/wizard/scop_address_wizard.xml @@ -30,6 +30,7 @@ <field name="cedex" placeholder="Cedex" class="o_address_city"/> <field name="state_id" placeholder="État" invisible="1"/> <field name="country_id" placeholder="Pays" invisible="1"/> + <field name="ur_id" required="1" options="{'no_open': True, 'no_create': True}"/> </div> </group> </group> diff --git a/wizard/scop_period_wizard.py b/wizard/scop_period_wizard.py index d3ee8659572f6308e8930af16be2c24e6608ccbd..cc7111557b9988dcbca56b04805678e7caa96384 100644 --- a/wizard/scop_period_wizard.py +++ b/wizard/scop_period_wizard.py @@ -161,7 +161,6 @@ class ScopPeriodWizard(models.TransientModel): string='Union Régionale', default=_default_ur_id) - # Action @api.onchange('zip_id') def _onchange_zip_id(self): diff --git a/wizard/scop_period_wizard.xml b/wizard/scop_period_wizard.xml index 89070290ba93c6b408a320a0db4157f5f211e4a8..ec98893136e0a2d72e1b0a30662c5f7cd12c031a 100644 --- a/wizard/scop_period_wizard.xml +++ b/wizard/scop_period_wizard.xml @@ -30,7 +30,7 @@ <field name="cedex" placeholder="Cedex" class="o_address_city"/> <field name="state_id" placeholder="État" invisible="1"/> <field name="country_id" placeholder="Pays" invisible="1"/> - <field name="ur_id" required="1"/> + <field name="ur_id" required="1" options="{'no_open': True, 'no_create': True}"/> </div> </group> <group>