diff --git a/models/res_partner.py b/models/res_partner.py index e4390aff0785c1cd6c4326fadbdca4edf0063a08..fb2cac3208400e26af6421aaa0f7be7ac10df0a9 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -43,22 +43,25 @@ class ScopPartner(models.Model): 'res.partner.cooperative.form', string="Cooperative form", on_delete='restrict', - index=True) + track_visibility='onchange') partner_company_type_id = fields.Many2one( comodel_name='res.partner.company.type', string='Legal Form', on_delete='restrict', - index=True) + track_visibility='onchange') membership_status = fields.Selection( [('member', 'Adhérent'), ('not_member', 'Non Adhérent'), ('out', 'Radié')], string="Statut d'adhésion", default="not_member") member_number = fields.Char("No adhérent") - cae = fields.Boolean("CAE", index=True) + cae = fields.Boolean("CAE", track_visibility='onchange') # Infos générales / Contact cedex = fields.Char("Cedex") + country_id = fields.Many2one('res.country', string='Country', + ondelete='restrict', + default=_default_country) admin_email = fields.Char('E-mail administratif') facebook = fields.Char("Facebook") linkedin = fields.Char("LinkedIn") @@ -73,7 +76,8 @@ class ScopPartner(models.Model): string='Union Régionale', index=True, on_delete='restrict', - default=_default_ur) + default=_default_ur, + track_visibility='onchange') creation_delegate_id = fields.Many2one( 'res.partner', string='Délégué de création', @@ -83,7 +87,8 @@ class ScopPartner(models.Model): 'res.partner', string='Délégué de suivi', domain=[('user_ids', '>', 0)], - on_delete='restrict') + on_delete='restrict', + track_visibility='onchange') parent_group_name = fields.Char('Coopérative mère', index=True) # Infos générales / Infos activité @@ -98,22 +103,26 @@ class ScopPartner(models.Model): domain=[('child_ids', '=', False)], on_delete='restrict') date_1st_sign = fields.Date( - 'Date 1er signature coop') + 'Date 1er signature coop', + track_visibility='onchange') registration_date = fields.Date( - string="Date d'immatriculation RCS") - social_object = fields.Text('Objet Social') + string="Date d'immatriculation RCS", + track_visibility='onchange') + social_object = fields.Text('Objet Social', track_visibility='onchange') naf_id = fields.Many2one( 'res.partner.naf', string='Code NAF', on_delete='restrict', - index=True) + track_visibility='onchange') industry_id = fields.Many2one('res.partner.industry', 'Industry', - on_delete='restrict', index=True) + 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) - capital = fields.Integer("Capital (en €") + siret = fields.Char(string='SIRET', size=14, index=True, + track_visibility='onchange') + capital = fields.Integer("Capital (en €)") first_closeout = fields.Date( '1er bilan en coop') closeout_month = fields.Selection( @@ -129,7 +138,8 @@ class ScopPartner(models.Model): (12851, 'Octobre'), (12852, 'Novembre'), (12853, 'Décembre')], - string='Mois clôture exercices', default=12853) + string='Mois clôture exercices', default=12853, + track_visibility='onchange') is_seed_scop = fields.Boolean("Est une SCOP d'amorçage") seed_end = fields.Date("Date de fin du dispositif d'amorçage", default=str(datetime.today() + timedelta(2556)), @@ -144,17 +154,19 @@ class ScopPartner(models.Model): 'res.partner.prescriber.canal', string='Canal de Prescription', on_delete='restrict') - sigle = fields.Char("Sigle de la coopérative") + sigle = fields.Char("Sigle") keywords_scic_ids = fields.Many2many( 'res.partner.keywords', string='Mots clés SCIC', on_delete='restrict') # Infos juridiques siren = fields.Char(string='SIREN', size=9, compute='_compute_siren') - dissolution_date = fields.Date('Date de Décès') + 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') + on_delete='restrict', + track_visibility='onchange') # Partenaires bank_id = fields.Many2one( @@ -242,7 +254,8 @@ class ScopPartner(models.Model): string='Liasses Fiscales') # Révisions - revision_contract = fields.Date("Date du contrat de révision") + revision_contract = fields.Date("Date du contrat de révision", + track_visibility='onchange') revision_company_id = fields.Many2one( 'res.partner', string='Organisme de révision', @@ -251,7 +264,8 @@ class ScopPartner(models.Model): 'Organisme réviseur'), ('organization_subtype_id.name', '=', 'Organisme réviseur, ' + 'Expert-comptable / Commissaire au compte')], - on_delete='restrict') + on_delete='restrict', + track_visibility='onchange') revision_backup_company_id = fields.Many2one( 'res.partner', string='Organisme de révision suppléant', @@ -265,13 +279,14 @@ class ScopPartner(models.Model): 'res.partner', string='Réviseur', domain=[('is_company', '=', False)], - on_delete='restrict') + on_delete='restrict', track_visibility='onchange') revision_certified_person_id = fields.Many2one( 'res.partner', string='Réviseur agréé', domain=[('is_company', '=', False)], on_delete='restrict') - revision_person_assign_date = fields.Date("Date de nomination du réviseur") + revision_person_assign_date = fields.Date("Date de nomination du réviseur", + track_visibility='onchange') revision_type = fields.Selection( [('1y', "Annuelle"), ('5y', 'Quinquennale'), @@ -281,9 +296,12 @@ class ScopPartner(models.Model): 'scop.revision.format', string='Format de révision', on_delete='restrict') - revision_last_date = fields.Date("Dernier exercice révisé") - revision_next_date = fields.Date("Prochain exercice révisable") - revision_staff = fields.Integer(string='Effectif révision') + revision_last_date = fields.Date("Dernier exercice révisé", + track_visibility='onchange') + revision_next_date = fields.Date("Prochain exercice révisable", + track_visibility='onchange') + revision_staff = fields.Integer(string='Effectif révision', + track_visibility='onchange') revision_ids = fields.One2many( comodel_name='scop.revision', @@ -333,12 +351,14 @@ class ScopPartner(models.Model): 'res.partner.organization.type', string="Type", domain=[('parent_id', '=', False)], - on_delete='restrict') + on_delete='restrict', + track_visibility='onchange') organization_subtype_id = fields.Many2one( 'res.partner.organization.type', string="Sous-Type", domain=[('child_ids', '=', False)], - on_delete='restrict') + on_delete='restrict', + track_visibility='onchange') @api.multi def open_facebook(self): @@ -374,31 +394,50 @@ class ScopPartner(models.Model): for partner in self: partner.organization_subtype_id = False - # Creation d'une periode lorsque le statut passe en Phase de Suivi - @api.onchange('project_status') - def onchange_project_status(self): - if self.project_status == '5_suivi': - new_period = self.env['scop.period'].create({ - 'partner_id': self._origin.id, - 'name': self.name, - 'cooperative_form_id': self.cooperative_form_id.id, - 'partner_company_type_id': self.partner_company_type_id.id, - 'siret': self.siret, - 'street': self.street, - 'street2': self.street2, - 'street3': self.street3, - 'zip': self.zip, - 'zip_id': self.zip_id.id, - 'city': self.city, - '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 - }) - self.scop_period_ids = new_period + def _create_period(self, partner): + new_period = self.env['scop.period'].create({ + 'partner_id': partner.id, + 'start': partner.registration_date or fields.Date.today(), + 'name': partner.name, + 'cooperative_form_id': partner.cooperative_form_id.id, + 'partner_company_type_id': partner.partner_company_type_id.id, + 'siret': partner.siret, + 'street': partner.street, + 'street2': partner.street2, + 'street3': partner.street3, + 'zip': partner.zip, + 'zip_id': partner.zip_id.id, + 'city': partner.city, + 'cedex': partner.cedex, + '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 + }) + partner.scop_period_ids = new_period + + # Creation d'une periode lorsque le statut passe en Phase de Suivi + @api.multi + def write(self, vals): + result = super(ScopPartner, self).write(vals) + if vals.get('project_status') == '5_suivi': + for partner in self: + self._create_period(partner) + return result + + # Création d'une période lors de la création d'une coopérative + @api.model_create_multi + def create(self, vals_list): + partners = super(ScopPartner, self).create(vals_list) + for vals in vals_list: + if vals.get('project_status') == '5_suivi': + for partner in partners: + self._create_period(partner) + return partners + @api.model def _compute_siren(self): diff --git a/models/scop_period.py b/models/scop_period.py index 91062307638c8f6298571206860a215642fe6b46..8fcfa12013cd54e8be2f6d7437a05a34b7585469 100644 --- a/models/scop_period.py +++ b/models/scop_period.py @@ -38,21 +38,20 @@ class ScopPeriod(models.Model): track_visibility='onchange', on_delete='restrict', required=True) siret = fields.Char(string='SIRET', size=14, required=True) - street = fields.Char(index=True) - street2 = fields.Char(index=True) - street3 = fields.Char(index=True) - zip = fields.Char(index=True) - zip_id = fields.Many2one('res.city.zip', 'ZIP Location', index=True) - city = fields.Char(index=True) - cedex = fields.Char(index=True) + street = fields.Char() + street2 = fields.Char() + street3 = fields.Char() + zip = fields.Char() + zip_id = fields.Many2one('res.city.zip', 'ZIP Location') + city = fields.Char() + cedex = fields.Char() state_id = fields.Many2one( "res.country.state", string='State', ondelete='restrict', - domain="[('country_id', '=?', country_id)]", - index=True) + domain="[('country_id', '=?', country_id)]") country_id = fields.Many2one( - 'res.country', string='Country', ondelete='restrict', index=True) + 'res.country', string='Country', ondelete='restrict') naf_id = fields.Many2one( 'res.partner.naf', string='Code NAF', diff --git a/views/res_partner.xml b/views/res_partner.xml index 05c750239f0e46edb5edb67de999ab8c2aff1101..a0464f500022936e2db9e1410c6f7f906321fb2e 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -73,42 +73,41 @@ <form string="Partner"> <div class="o_address_format" modifiers="{}"> <field name="type" invisible="1" modifiers="{'invisible':true}"/> - <field name="is_cooperative" invisible="1" modifiers="{'invisible':true}"/> <field name="city_id" invisible="1" modifiers="{'invisible':true}"/> <div attrs="{'invisible': ['|', ('parent_id', '=', False), ('type', '!=', 'contact')]}" class="oe_edit_only" modifiers="{'invisible':['|',['parent_id','=',false],['type','!=','contact']]}"> <b modifiers="{}"> Adresse de la société: </b> </div> - <field name="street" placeholder="Rue..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> - <field name="street2" placeholder="Rue 2..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> - <field name="street3" placeholder="Rue 3..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> - <field name="zip_id" options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" placeholder="CP - Ville autocompletion..." class="oe_edit_only" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" + <field name="street" placeholder="Rue..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> + <field name="street2" placeholder="Rue 2..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> + <field name="street3" placeholder="Rue 3..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> + <field name="zip_id" options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" placeholder="CP / Ville autocomplétion..." class="oe_edit_only" + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" on_change="1" can_create="true" can_write="true" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> <field name="parent_id" invisible="1" on_change="1" can_create="true" can_write="true" modifiers="{'invisible':true}"/> <field name="zip" placeholder="Code postal" class="o_address_city" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" on_change="1" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" on_change="1" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> <field name="city" placeholder="Ville" class="o_address_city" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> <field name="cedex" placeholder="Cedex" class="o_address_city" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> <field name="state_id" class="o_address_zip" placeholder="État" options="{'no_open': True}" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" context="{'country_id': country_id, 'zip': zip}" on_change="1" can_create="true" can_write="true" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> <field name="country_id" placeholder="Pays" class="o_address_country" options="{'no_open': True, 'no_create': True}" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False), ('is_cooperative','=',True)]}" + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" on_change="1" can_create="true" can_write="true" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false],['is_cooperative','=',True]]}"/> + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> </div> </form> </field> diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index fb353025ba795ea10295dd9b94ee357b0f6acbea..44c223847c867dee5773590d35693f75f2c8b221 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -12,8 +12,6 @@ <filter name="type_person" position="replace"> </filter> <filter name="type_company" position="replace"> - <filter string="Prospects" name="type_prospect" domain="[('is_company','=',True),('is_cooperative','=',True),('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion'))]"/> - <filter string="Coopératives" name="type_cooperative" domain="[('is_company','=',True),('is_cooperative','=',True),('project_status','=','5_suivi')]"/> <filter string="Mon UR" name="my_ur" domain="[('current_user_ur_id', '=', 'ur_id')]"/> </filter> <filter name="customer" position="replace"></filter> @@ -75,7 +73,7 @@ <field name="arch" type="xml"> <form string="Cooperatives"> <header> - <button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': ['|', ('write_date', '=', False),('project_status', '!=', '5_suivi')]}"/> + <button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '5_suivi')]}"/> <button string="Décés/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': [('project_status', '!=', '5_suivi')]}"/> <field name="project_status" widget="statusbar" clickable="True" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion,5_suivi"/> </header> @@ -97,16 +95,16 @@ <field name="write_date" invisible="1"/> <field name="type" attrs="{'invisible': [('parent_id','=', False)]}" groups="base.group_no_one"/> <h1> - <field name="name" default_focus="1" placeholder="Raison Sociale" attrs="{'readonly': [('write_date', '!=', False)]}"/> + <field name="name" default_focus="1" required="1" placeholder="Raison Sociale" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}"/> </h1> <div class="oe_bloc_cgscop"> <div class="o_row d-flex"> <h3> - <field class="o_field_header" name="cooperative_form_id" attrs="{'readonly': [('project_status', '=', '5_suivi')]}" options="{'no_open': True}"/> + <field class="o_field_header" name="cooperative_form_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')], 'required':[('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '5_suivi'))]}" options="{'no_open': True}" placeholder="Forme Coopérative"/> </h3> <span> </span> <h3> - <field options="{'no_open': True}" name="partner_company_type_id" attrs="{'readonly': [('project_status', '=', '5_suivi')]}"/> + <field options="{'no_open': True}" name="partner_company_type_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')], 'required':[('project_status','in',('4_adhesion', '5_suivi'))]}" placeholder="Statut Juridique"/> </h3> </div> <div class="o_row d-flex "> @@ -116,10 +114,10 @@ <h3> <field name="member_number" readonly="True" class="o_field_header"/> </h3> - <h3 > - <span name="cae" class="o_field_widget o_readonly_modifier o_field_header" attrs="{'invisible':[('cae','=',False)]}">CAE</span> - <field name="cae" invisible="1" /> - <!-- <field name="cae" attrs="{'readonly': [('project_status', '=', '5_suivi')]}" /> --> + <h3> + <span name="cae" class="o_field_widget o_readonly_modifier o_field_header oe_read_only" attrs="{'invisible':[('cae','=',False)]}">CAE</span> + <label for='cae' string="CAE" class="oe_edit_only"/> + <field name="cae" class="oe_edit_only" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')], 'required':[('project_status','in',('4_adhesion', '5_suivi'))]}" /> </h3> <field name="supplier" invisible="True"/> <field name="customer" invisible="True"/> @@ -130,21 +128,25 @@ <group col="3" string="Informations Générales"> <group string="Contact"> <label for='street' string="Adresse Administrative"/> - <div class="o_address_format oe_read_only" modifiers="{}"> - <field name="street" placeholder="Rue..." class="o_address_street"/> - <field name="street2" placeholder="Rue 2..." class="o_address_street"/> - <field name="street3" placeholder="Rue 3..." class="o_address_street"/> + <div> + <field name="street" placeholder="Rue..." class="o_address_street" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}"/> + <field name="street2" placeholder="Rue 2..." class="o_address_street" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}"/> + <field name="street3" placeholder="Rue 3..." class="o_address_street" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}"/> <field name="zip_id" options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" - placeholder="City completion" - class="oe_edit_only"/> - <field name="zip" placeholder="ZIP" class="o_address_zip"/> - <field name="city" placeholder="Ville" class="o_address_city" - attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="cedex" class="o_address_city"/> - <field name="state_id" class="o_address_state" placeholder="State" - options='{"no_open": True}' context="{'country_id': country_id, 'zip': zip}"/> - <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/> + placeholder="CP / Ville autocomplétion..." + class="oe_edit_only" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}"/> + <field name="zip" placeholder="CP..." class="o_address_city" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}"/> + <field name="city" placeholder="Ville..." class="o_address_city" + attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}" modifiers="{'readonly':[['project_status', '=', '5_suivi']]}"/> + <field name="city_id" invisible="1"/> + <field name="cedex" placeholder="Cedex" class="o_address_city" + attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}" modifiers="{'readonly':[['project_status', '=', '5_suivi']]}"/> + <field name="state_id" class="o_address_zip" placeholder="Région" + options='{"no_open": True}' context="{'country_id': country_id, 'zip': zip}" + attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}" modifiers="{'readonly':[['project_status', '=', '5_suivi']]}"/> + <field name="country_id" placeholder="Pays" class="o_address_country" options='{"no_open": True, "no_create": True}' + attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')]}" modifiers="{'readonly':[['project_status', '=', '5_suivi']]}"/> </div> <field name="phone" widget="phone" string="Téléphone 1"/> <field name="mobile" widget="phone" string="Téléphone 2"/> @@ -170,7 +172,7 @@ <field class="oe_edit_only" name="twitter" widget="url"/> </div> <field name="director_ids" mode="kanban" - context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'contact'}"> + 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_zip_id': zip_id, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'contact'}"> <kanban> <field name="id"/> <field name="color"/> @@ -185,9 +187,10 @@ <field name="street"/> <field name="street2"/> <field name="street3"/> - <field name="zip"/> <field name="zip_id"/> + <field name="zip"/> <field name="city"/> + <field name="cedex"/> <field name="country_id"/> <field name="mobile"/> <field name="state_id"/> @@ -205,7 +208,7 @@ <field name="name"/> <div t-if="record.function.raw_value"><field name="function"/></div> <div t-if="record.email.raw_value"><field name="email" widget="email"/></div> - <div t-if="record.phone.raw_value">Phone: <field name="phone" widget="phone"/></div> + <div t-if="record.phone.raw_value">Téléphone: <field name="phone" widget="phone"/></div> <div t-if="record.mobile.raw_value">Mobile: <field name="mobile" widget="phone"/></div> </div> </div> @@ -224,19 +227,20 @@ <field name="zip_id"/> <field name="zip"/> <field name="city"/> + <field name="cedex"/> <field name="state_id"/> <field name="country_id"/> </group> <group> <field name="name" string="Contact Name" attrs="{'required' : [('type', '=', 'contact')]}"/> - <field name="title" placeholder="e.g. Mr." + <field name="title" placeholder="Madame" attrs="{'invisible': [('type','!=', 'contact')]}"/> - <field name="function" placeholder="e.g. Sales Director" + <field name="function" placeholder="Responsable des ventes" attrs="{'invisible': [('type','!=', 'contact')]}"/> <field name="email"/> <field name="phone" widget="phone"/> <field name="mobile" widget="phone"/> - <field name="comment" placeholder="internal note..."/> + <field name="comment" placeholder="Commentaires..."/> </group> </group> <field name="supplier" invisible="True"/> @@ -262,11 +266,11 @@ <field name="creation_suborigin_id" attrs="{'required':[('creation_origin_id','!=',False)]}" domain="[('parent_id', '=', creation_origin_id), ('child_ids', '=', False)]" options="{'no_create': True}"/> <field name="date_1st_sign" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> <field name="registration_date" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> - <field name="social_object" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> - <field name="naf_id" attrs="{'readonly': [('project_status', '=', '5_suivi')]}" context="{'partner_category_display': 'short'}" options="{'no_create': True}"/> - <field name="industry_id" options="{'no_create': True}" attrs="{'readonly': [('project_status', '=', '5_suivi')]}" /> + <field name="social_object" attrs="{'required':[('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '5_suivi'))]}"/> + <field name="naf_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')], 'required':[('project_status','in',('4_adhesion', '5_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', '=', '5_suivi')]}" /> <field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/> - <field name="siret" attrs="{'readonly': [('project_status', '=', '5_suivi')]}"/> + <field name="siret" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '5_suivi')], 'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> <field name="capital" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> <field name="first_closeout" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> <field name="closeout_month" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/> @@ -382,8 +386,8 @@ <field name="street3" readonly="1"/> <field name="zip" invisible="1"/> <field name="zip_id" readonly="1"/> - <field name="city" /> - <field name="cedex" /> + <field name="city" readonly="1"/> + <field name="cedex" readonly="1"/> <field name="state_id" invisible="1"/> <field name="country_id" invisible="1"/> </group> @@ -425,7 +429,6 @@ <field name="state_id"/> <field name="image_small"/> <field name="lang"/> - <!-- fields in form x2many view to diminish requests --> <field name="comment"/> <field name="customer"/> <field name="display_name"/> @@ -477,7 +480,7 @@ <group attrs="{'invisible': [('type','=', 'contact')]}"> <label for="street" string="Address"/> <div> - <div class="o_address_format" name="div_address"> + <div name="div_address"> <field name="street" placeholder="Rue..." class="o_address_street"/> <field name="street2" placeholder="Rue 2..." class="o_address_street"/> <field name="street3" placeholder="Rue 3..." class="o_address_street"/> @@ -485,12 +488,13 @@ options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" placeholder="City completion" class="oe_edit_only"/> - <field name="zip" placeholder="ZIP" class="o_address_zip"/> + <field name="zip" placeholder="ZIP" class="o_address_city"/> <field name="city" placeholder="Ville" class="o_address_city" attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"/> + <field name="city_id" invisible="1"/> <field name="cedex" placeholder="Cedex" class="o_address_city" attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="state_id" class="o_address_state" placeholder="State" + <field name="state_id" class="o_address_zip" placeholder="State" options='{"no_open": True}' context="{'country_id': country_id, 'zip': zip}"/> <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/> </div> diff --git a/wizard/scop_deces_wizard.py b/wizard/scop_deces_wizard.py index a810bc9f42731d486483bd34814c56571fc7d79c..a738c8ac7763dc6797af213e7bbd962b041c0302 100644 --- a/wizard/scop_deces_wizard.py +++ b/wizard/scop_deces_wizard.py @@ -52,7 +52,6 @@ class ScopDecesWizard(models.TransientModel): # Close previous period last_period_id = self.env['scop.period'].browse( self.last_period_id.id) - print("last_period_id",last_period_id) last_period_id.write({ 'end': self.end, 'end_reason': self.end_reason,