diff --git a/models/res_partner.py b/models/res_partner.py index 734890db21ece47d45bc38630a45be920ea46b60..387b3819dfd0c72420fe25e5852dc6a7906e6a87 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -361,9 +361,9 @@ class ScopPartner(models.Model): compute="_compute_contact_legality", store=True) associate = fields.Selection( - selection=[('asso',"Associé extérieur"), - ('coop',"Associé coopérateur"), - ('none',"Non associé")], + selection=[('asso', "Associé extérieur"), + ('coop', "Associé coopérateur"), + ('none', "Non associé")], string="Associé") employee = fields.Boolean( string="Salarié", diff --git a/models/res_partner_newsletter.py b/models/res_partner_newsletter.py index f4fb17fba746dd822251dfc33d7f55c11acb0201..f9d023c26b09f12ea14c5e6c5553325307a80d1d 100644 --- a/models/res_partner_newsletter.py +++ b/models/res_partner_newsletter.py @@ -23,7 +23,6 @@ class ResPartnerNewsletterSubscription(models.Model): default=True) - class ResPartnerNewsletter(models.Model): _name = "res.partner.newsletter" _description = "Newsletter" diff --git a/wizard/scop_deces_wizard.py b/wizard/scop_deces_wizard.py index d801e49d6702c706574afe7bd29378381e32e2d6..35327c3255ef90343cc300581c88d090eac5c713 100644 --- a/wizard/scop_deces_wizard.py +++ b/wizard/scop_deces_wizard.py @@ -63,21 +63,22 @@ class ScopDecesWizard(models.TransientModel): 'dissolution_reason_id': period.dissolution_reason_id.id }) - #......................................... + # # HS 08/04/2020 # On procède à la radiation à la même date - #.......................................... + # # Lecture du motif de radiation type décès motif = self.env.ref('cgscop_partner.reason_end_membership_5') # Mise à jour des périodes d'adhésions if motif: adh_period = self.env['scop.membership.period'].search( - [('partner_id', '=', period.partner_id), ('end', '=', False)]) + [('partner_id', '=', period.partner_id), + ('end', '=', False)]) for adh in adh_period: adh.write({ - 'end': period.end, - 'end_reason_id': motif.id + 'end': period.end, + 'end_reason_id': motif.id }) else: