diff --git a/models/res_partner.py b/models/res_partner.py index c51445711982875ebef8b1ddfee9f81ccd73feaa..a1644572fe97acf5e5c14eee0bc88afa5eb5d194 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -7,6 +7,9 @@ from odoo import models, fields class ScopPartner(models.Model): _inherit = "res.partner" + def _default_company(self): + return self.env['res.company']._company_default_get('res.partner') + # Infos générales is_cooperative = fields.Boolean("Est une coopérative") @@ -14,12 +17,12 @@ class ScopPartner(models.Model): # A garder ? unique_id_si_ur = fields.Char("Identifiant unique SI UR") unique_id_si_cg = fields.Char("Identifiant unique SI CG") - - ur = fields.Many2one( + company_id = fields.Many2one( 'res.company', string='Union Régionale', - domain=[('id', '!=', 1)], - on_delete='restrict') + index=True, + on_delete='restrict', + default=_default_company) siren = fields.Char(string='SIREN', size=9) registration_date = fields.Date( string="Date d'immatriculation RCS") @@ -44,6 +47,12 @@ class ScopPartner(models.Model): ('transmission', 'Transmission'), ('takeover', 'reprise')], string='Origine création en coop') + origin_company_type_id = fields.Many2one( + comodel_name='res.partner.company.type', + string="Forme juridique d'origine", + track_visibility='onchange', + on_delete='restrict' + ) project_status = fields.Selection( [('1_information', "Phase d'information"), ('2_pre-diagnostic', 'Phase de pré-diagnostic'), @@ -114,7 +123,7 @@ class ScopPartner(models.Model): on_delete='restrict') cae = fields.Boolean("CAE", track_visibility='onchange') is_seed_scop = fields.Boolean("Est une SCOP d'amorçage", - track_visibility='onchange') + track_visibility='onchange') siret = fields.Char(string='SIRET', size=14, track_visibility='onchange') name = fields.Char(index=True, track_visibility='always') street = fields.Char(track_visibility='onchange') diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index 88192f4c0d7fe74dc6cc10bd014753969640ab45..645ca7d39169ac88e7dd5625b45761fbd875613c 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -166,12 +166,13 @@ attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> </group> <group string="UR"> - <field name="ur" required="True"/> + <field name="company_id" required="True" domain="[('id', '!=', 1)]"/> <field name="creation_delegate_id" widget="res_partner_many2one" attrs="{'required':[('project_status','in',('2_pre-diagnostic','3_accompagnement','4_adhesion', '5_suivi'))]}"/> <field name="followup_delegate_id" widget="res_partner_many2one" attrs="{'required':[('project_status','in',('5_suivi'))]}"/> <field name="revision_delegate_id" widget="res_partner_many2one" attrs="{'required':[('project_status','in',('5_suivi'))]}"/> <field name="creation_origin" required="True"/> + <field name="origin_company_type_id" required="True"/> <field name="project_status" required="True"/> <field name="cooperative_form_id" attrs="{'required':[('project_status','in',('2_pre-diagnostic','3_accompagnement','4_adhesion', '5_suivi'))]}"/> <field name="date_1st_sign" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>