diff --git a/models/res_partner.py b/models/res_partner.py index b68309760b101315a65c822e6c6b7558f194ce29..55872823ac4122527ac756405acc56f87834acd8 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -58,6 +58,14 @@ class ScopPartner(models.Model): member_number = fields.Char("No adhérent") cae = fields.Boolean("CAE", track_visibility='onchange') + dissolution_date = fields.Date('Date de Décès', + track_visibility='onchange') + dissolution_reason_id = fields.Many2one( + 'res.partner.dissolution.reason', + string="Motif Décés", + on_delete='restrict', + track_visibility='onchange') + # Infos générales / Contact cedex = fields.Char("Cedex") country_id = fields.Many2one('res.country', string='Country', @@ -91,7 +99,6 @@ class ScopPartner(models.Model): domain=[('user_ids', '>', 0)], on_delete='restrict', track_visibility='onchange') - parent_group_name = fields.Char('Coopérative mère', index=True) # Infos générales / Infos activité creation_origin_id = fields.Many2one( @@ -116,14 +123,12 @@ class ScopPartner(models.Model): string='Code NAF', on_delete='restrict', track_visibility='onchange') - industry_id = fields.Many2one('res.partner.industry', 'Industry', - on_delete='restrict', - track_visibility='onchange') certification_ids = fields.Many2many( comodel_name='res.partner.certification', string='Agrément', on_delete='restrict') siret = fields.Char(string='SIRET', size=14, index=True, track_visibility='onchange') + siren = fields.Char(string='SIREN', size=9, compute='_compute_siren') capital = fields.Integer("Capital (en €)") first_closeout = fields.Date( '1er bilan en coop') @@ -159,16 +164,6 @@ class ScopPartner(models.Model): on_delete='restrict') sigle = fields.Char("Sigle") - # Infos juridiques - siren = fields.Char(string='SIREN', size=9, compute='_compute_siren') - dissolution_date = fields.Date('Date de Décès', - track_visibility='onchange') - dissolution_reason_id = fields.Many2one( - 'res.partner.dissolution.reason', - string="Motif Décés", - on_delete='restrict', - track_visibility='onchange') - # Partenaires bank_id = fields.Many2one( 'res.partner', @@ -210,15 +205,11 @@ class ScopPartner(models.Model): domain=[('is_company', '=', False)], on_delete='restrict') - # Contacts / Adresses - is_main_location = fields.Boolean("Est l'établissement principal", - track_visibility='onchange') - # Périodes juridiques scop_period_ids = fields.One2many( comodel_name='scop.period', inverse_name='partner_id', - string="Périodes Juridiques") + string="Historique") # Période d'adhésion membership_period_ids = fields.One2many( @@ -249,7 +240,7 @@ class ScopPartner(models.Model): questionnaire_ids = fields.One2many( comodel_name='scop.questionnaire', inverse_name='partner_id', - string='Questionnaire') + string='Listes Ministrère') # Liasse fiscale liasse_fiscale_ids = fields.One2many( @@ -312,12 +303,6 @@ class ScopPartner(models.Model): inverse_name='partner_id', string='Liste des Révisions') - # Evènements juridiques - legal_event_ids = fields.One2many( - comodel_name='scop.legal.event', - inverse_name='partner_id', - string='Evènements Juridiques') - # Outils financiers financial_tools_ids = fields.One2many( comodel_name='scop.financial.tools', @@ -413,10 +398,7 @@ class ScopPartner(models.Model): 'state_id': partner.state_id.id, 'country_id': partner.country_id.id, 'naf_id': partner.naf_id.id, - 'industry_id': partner.industry_id.id, - 'cae': partner.cae, - 'parent_group_name': partner.parent_group_name, - 'is_main_location': partner.is_main_location + 'cae': partner.cae }) partner.scop_period_ids = new_period diff --git a/models/scop_period.py b/models/scop_period.py index 71545b53d7af223d94f04847c339e65eea01cbdc..b2690a2e72de7d3190ae46e3d3e067904e6688a3 100644 --- a/models/scop_period.py +++ b/models/scop_period.py @@ -56,8 +56,4 @@ class ScopPeriod(models.Model): 'res.partner.naf', string='Code NAF', on_delete='restrict') - industry_id = fields.Many2one('res.partner.industry', 'Industry', - on_delete='restrict') cae = fields.Boolean("CAE") - parent_group_name = fields.Char('Coopérative mère') - is_main_location = fields.Boolean("Est l'établissement principal") diff --git a/views/res_partner.xml b/views/res_partner.xml index a781a30e6b6c56274ae13c6d868da1d4e0f2ccba..6a013eca33513cc9c24c7934092fed9e0567f1f9 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -91,7 +91,6 @@ <group name="Infos activités" attrs="{'invisible': [('is_company','=', False)]}"> <field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" attrs="{'invisible': [('is_company','=', False)]}"/> <field name="category_id" string="Segmentation" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Territoire Rattaché..." can_create="true" can_write="true" modifiers="{}" attrs="{'invisible': [('is_company','=', False)]}" domain="[('ur_id', '=', ur_id)]"/> - <field name="industry_id" attrs="{'invisible': [('is_company','=', False)]}" options="{'no_create': True}"/> <field name="organization_type_id" attrs="{'invisible': [('is_company','=', False)]}" options="{'no_create': True}"/> <field name="organization_subtype_id" attrs="{'invisible': [('is_company','=', False)]}" domain="[('parent_id', '=', organization_type_id), ('child_ids', '=', False)]" options="{'no_create': True}"/> </group> diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index f04323a096bfe35d3d454f70b98d1957ca145117..91d802d3988215a194711524b2cfeda9f0ed6aa5 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -266,7 +266,6 @@ attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '6_suivi'))]}" options="{'no_create': True}"/> <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_create': True}"/> <field name="revision_person_id" widget="res_partner_many2one" readonly="True" options="{'no_create': True}"/> - <field name="parent_group_name" attrs="{'readonly': [('project_status', '=', '6_suivi')]}" /> <field name="category_id" string="Segmentation" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" domain="[('ur_id', '=', ur_id)]"/> </group> <group string="Informations Activité"> @@ -276,7 +275,6 @@ <field name="registration_date" attrs="{'required':[('project_status','in',('4_adhesion', '6_suivi'))]}"/> <field name="social_object" attrs="{'required':[('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '6_suivi'))]}"/> <field name="naf_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '6_suivi'))]}" context="{'partner_category_display': 'short'}" options="{'no_create': True}"/> - <field name="industry_id" options="{'no_create': True}" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}" /> <field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/> <field name="siret" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '6_suivi'))]}"/> <field name="capital" attrs="{'required':[('project_status','in',('4_adhesion', '6_suivi'))]}"/> @@ -290,127 +288,7 @@ </group> </group> <notebook colspan="4"> - <page name="juridical_info" string="Informations Juridiques" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <group> - <field name="siren" readonly="True"/> - <field name="dissolution_date"/> - <field name="dissolution_reason_id" options="{'no_create': True}"/> - </group> - </page> - <page name="partners" string="Partenaires"> - <group> - <field name="bank_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="bank2_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="accountant_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="accountant_person_id" widget="res_partner_many2one" attrs="{'invisible': [('accountant_id', '=', False)]}" domain="[('parent_id', '=', accountant_id), ('is_company', '=', False)]" options="{'no_create': True}"/> - <field name="auditor_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="auditor_person_id" widget="res_partner_many2one" attrs="{'invisible': [('auditor_id', '=', False)]}" domain="[('parent_id', '=', auditor_id), ('is_company', '=', False)]" options="{'no_create': True}"/> - </group> - </page> - <!--page name='scop_ministry_list' string="Listes Ministère"> - <group> - <field name="direccte_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="last_update_status"/> - <field name="ministry_list_ids" mode="tree"> - <tree group_create="False" group_edit="False" group_delete="False"/> - <form/> - </field> - </group> - </page--> - <page name='scop_revision' string="Révisions" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <group string="Informations de révision"> - <group> - <field name="revision_contract"/> - <field name="revision_company_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="revision_backup_company_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="revision_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]"/> - <field name="revision_certified_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]"/> - <field name="revision_person_assign_date"/> - </group> - <group> - <field name="revision_type"/> - <field name="revision_format_id" options="{'no_create': True}"/> - <field name="revision_staff"/> - <field name="revision_last_date"/> - <field name="revision_next_date"/> - </group> - </group> - <field name="revision_ids" mode="tree"> - <tree/> - <form/> - </field> - </page> - <page name="scop_periods" string="Historique des périodes" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <field name="scop_period_ids" mode="tree" - context="{'default_partner_id': active_id, 'default_name': name, 'default_cooperative_form_id': cooperative_form_id, 'default_partner_company_type_id': partner_company_type_id, 'default_siret': siret, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_country_id': country_id, 'default_naf_id': naf_id, 'default_cae': cae, 'default_is_main_location': is_main_location, 'default_parent_group_name': parent_group_name}"> - <tree string="Périodes" decoration-muted="end_reason!=False" create="false" edit="false" delete="false"> - <field name="partner_id" invisible="1"/> - <field name="start"/> - <field name="end"/> - <field name="end_reason"/> - <field name="comments"/> - <field name="name"/> - <field name="cooperative_form_id"/> - <field name="partner_company_type_id"/> - <field name="siret"/> - <field name="street"/> - <field name="street2"/> - <field name="street3"/> - <field name="zip"/> - <field name="zip_id" invisible="1"/> - <field name="city"/> - <field name="cedex"/> - <field name="state_id" invisible="1"/> - <field name="country_id" invisible="1"/> - <field name="naf_id"/> - <field name="cae"/> - <field name="is_main_location"/> - <field name="parent_group_name"/> - <control> - <create string="Créer une nouvelle période"/> - </control> - </tree> - <form> - <group name="period" string="Période" col="2"> - <group> - <field name="start" readonly="1"/> - </group> - <group> - <field name="end" readonly="1"/> - <field name="end_reason" readonly="1"/> - <field name="comments" readonly="1"/> - </group> - </group> - <group col="2"> - <group> - <field name="name" readonly="1"/> - <field name="cooperative_form_id" readonly="1"/> - <field name="partner_company_type_id" readonly="1"/> - <field name="siret" readonly="1"/> - <field name="street" readonly="1"/> - <field name="street2" readonly="1"/> - <field name="street3" readonly="1"/> - <field name="zip" invisible="1"/> - <field name="zip_id" readonly="1"/> - <field name="city" readonly="1"/> - <field name="cedex" readonly="1"/> - <field name="state_id" invisible="1"/> - <field name="country_id" invisible="1"/> - </group> - <group> - <field name="naf_id" readonly="1"/> - <field name="cae" readonly="1"/> - <field name="is_main_location" readonly="1"/> - <field name="parent_group_name" readonly="1"/> - </group> - </group> - </form> - </field> - </page> <page name="contacts" string="Contacts & Addresses"> - <group> - <field name="is_main_location" attrs="{'readonly': [('project_status', '=', '6_suivi')]}"/> - </group> <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id}"> <kanban> @@ -530,6 +408,119 @@ </form> </field> </page> + <page name="juridical_info" string="Informations Juridiques" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> + <group> + <field name="siren" readonly="True"/> + <field name="dissolution_date"/> + <field name="dissolution_reason_id" options="{'no_create': True}"/> + </group> + </page> + <page name="partners" string="Partenaires"> + <group> + <field name="bank_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <field name="bank2_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <field name="accountant_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <field name="accountant_person_id" widget="res_partner_many2one" attrs="{'invisible': [('accountant_id', '=', False)]}" domain="[('parent_id', '=', accountant_id), ('is_company', '=', False)]" options="{'no_create': True}"/> + <field name="auditor_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <field name="auditor_person_id" widget="res_partner_many2one" attrs="{'invisible': [('auditor_id', '=', False)]}" domain="[('parent_id', '=', auditor_id), ('is_company', '=', False)]" options="{'no_create': True}"/> + </group> + </page> + <!--page name='scop_ministry_list' string="Listes Ministère"> + <group> + <field name="direccte_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <field name="last_update_status"/> + <field name="ministry_list_ids" mode="tree"> + <tree group_create="False" group_edit="False" group_delete="False"/> + <form/> + </field> + </group> + </page--> + <page name='scop_revision' string="Révisions" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> + <group string="Informations de révision"> + <group> + <field name="revision_contract"/> + <field name="revision_company_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <field name="revision_backup_company_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <field name="revision_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]"/> + <field name="revision_certified_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]"/> + <field name="revision_person_assign_date"/> + </group> + <group> + <field name="revision_type"/> + <field name="revision_format_id" options="{'no_create': True}"/> + <field name="revision_staff"/> + <field name="revision_last_date"/> + <field name="revision_next_date"/> + </group> + </group> + <field name="revision_ids" mode="tree"> + <tree/> + <form/> + </field> + </page> + <page name="scop_periods" string="Historique des périodes" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> + <field name="scop_period_ids" mode="tree" + context="{'default_partner_id': active_id, 'default_name': name, 'default_cooperative_form_id': cooperative_form_id, 'default_partner_company_type_id': partner_company_type_id, 'default_siret': siret, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_country_id': country_id, 'default_naf_id': naf_id, 'default_cae': cae}"> + <tree string="Périodes" decoration-muted="end_reason!=False" create="false" edit="false" delete="false"> + <field name="partner_id" invisible="1"/> + <field name="start"/> + <field name="end"/> + <field name="end_reason"/> + <field name="comments"/> + <field name="name"/> + <field name="cooperative_form_id"/> + <field name="partner_company_type_id"/> + <field name="siret"/> + <field name="street"/> + <field name="street2"/> + <field name="street3"/> + <field name="zip"/> + <field name="zip_id" invisible="1"/> + <field name="city"/> + <field name="cedex"/> + <field name="state_id" invisible="1"/> + <field name="country_id" invisible="1"/> + <field name="naf_id"/> + <field name="cae"/> + <control> + <create string="Créer une nouvelle période"/> + </control> + </tree> + <form> + <group name="period" string="Période" col="2"> + <group> + <field name="start" readonly="1"/> + </group> + <group> + <field name="end" readonly="1"/> + <field name="end_reason" readonly="1"/> + <field name="comments" readonly="1"/> + </group> + </group> + <group col="2"> + <group> + <field name="name" readonly="1"/> + <field name="cooperative_form_id" readonly="1"/> + <field name="partner_company_type_id" readonly="1"/> + <field name="siret" readonly="1"/> + <field name="street" readonly="1"/> + <field name="street2" readonly="1"/> + <field name="street3" readonly="1"/> + <field name="zip" invisible="1"/> + <field name="zip_id" readonly="1"/> + <field name="city" readonly="1"/> + <field name="cedex" readonly="1"/> + <field name="state_id" invisible="1"/> + <field name="country_id" invisible="1"/> + </group> + <group> + <field name="naf_id" readonly="1"/> + <field name="cae" readonly="1"/> + </group> + </group> + </form> + </field> + </page> <page name='internal_notes' string="Commentaires"> <field name="comment" placeholder="Commentaires..."/> </page> diff --git a/wizard/scop_period_wizard.py b/wizard/scop_period_wizard.py index ec98de8a765a94e59d060419f82fb78cb6b34e7c..75720da6167905d30bf724651be3680ea41aab99 100644 --- a/wizard/scop_period_wizard.py +++ b/wizard/scop_period_wizard.py @@ -90,26 +90,11 @@ class ScopPeiodWizard(models.TransientModel): return self.env['res.partner'].browse( self.env.context.get('active_id')).naf_id - @api.model - def _default_industry_id(self): - return self.env['res.partner'].browse( - self.env.context.get('active_id')).industry_id - @api.model def _default_cae(self): return self.env['res.partner'].browse( self.env.context.get('active_id')).cae - @api.model - def _default_parent_group_name(self): - return self.env['res.partner'].browse( - self.env.context.get('active_id')).parent_group_name - - @api.model - def _default_is_main_location(self): - return self.env['res.partner'].browse( - self.env.context.get('active_id')).is_main_location - # Fields common partner_id = fields.Integer('Partner', default=_default_partner_id) @@ -163,14 +148,7 @@ class ScopPeiodWizard(models.TransientModel): 'res.partner.naf', string='Code NAF', on_delete='restrict', default=_default_naf_id) - industry_id = fields.Many2one('res.partner.industry', 'Industry', - on_delete='restrict', - default=_default_industry_id) cae = fields.Boolean("CAE", default=_default_cae) - parent_group_name = fields.Char('Coopérative mère', - default=_default_parent_group_name) - is_main_location = fields.Boolean("Est l'établissement principal", - default=_default_is_main_location) # Action @@ -202,10 +180,7 @@ class ScopPeiodWizard(models.TransientModel): 'state_id': self.state_id.id, 'country_id': self.country_id.id, 'naf_id': self.naf_id.id, - 'industry_id': self.industry_id.id, - 'cae': self.cae, - 'parent_group_name': self.parent_group_name, - 'is_main_location': self.is_main_location + 'cae': self.cae }) # Close previous period @@ -235,8 +210,5 @@ class ScopPeiodWizard(models.TransientModel): 'state_id': self.state_id.id, 'country_id': self.country_id.id, 'naf_id': self.naf_id.id, - 'industry_id': self.industry_id.id, - 'cae': self.cae, - 'parent_group_name': self.parent_group_name, - 'is_main_location': self.is_main_location + 'cae': self.cae }) diff --git a/wizard/scop_period_wizard.xml b/wizard/scop_period_wizard.xml index 3c64d16040b5185bdd687fda1bcce404ab658d44..70166fd9dfc0b958e44818f3d381bae9d190ec92 100644 --- a/wizard/scop_period_wizard.xml +++ b/wizard/scop_period_wizard.xml @@ -35,8 +35,6 @@ <group> <field name="naf_id" required="1"/> <field name="cae"/> - <field name="is_main_location"/> - <field name="parent_group_name"/> </group> </group> <footer>