diff --git a/models/res_partner.py b/models/res_partner.py index f67d256d07aff37b9ac625bfda8fe29147deb39e..1f87989d0b9d58d8338072b5ea09023f297e8590 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -334,10 +334,8 @@ class ScopPartner(models.Model): @return : True """ # Check Staff - staff_line = self.staff_ids.filtered( - lambda s: s.type_entry == "membership" - ).sorted(key="effective_date", reverse=True) - if not (staff_line or staff_line[0].staff_count > 0): + staff_line = self.get_last_membership_staff() + if not (staff_line or staff_line.staff_count > 0): raise UserError(_("Les effectifs à l'adhésion ne sont pas renseignés.")) # Check financial datas if not self.liasse_membership_id: @@ -415,13 +413,15 @@ class ScopPartner(models.Model): "extranet_service_access": True, } ) - - # TODO: Supprimer ? - # set liasse_fiscale_adhesion as qualified - # self.lm_adhesion_id.scop_liasse_fiscale_id.write({"is_qualified": True}) - return True + def get_last_membership_staff(self): + self.ensure_one() + staff_line = self.staff_ids.filtered( + lambda s: s.type_entry == "membership" + ).sorted(key="effective_date", reverse=True) + return staff_line[0] if staff_line else False + class ResPartnerPrescriberCanal(models.Model): _name = "res.partner.prescriber.canal" diff --git a/models/scop_adhesion_file.py b/models/scop_adhesion_file.py index 661d9ef5d49cf80440a77df6ec0ae4e733b728c1..ba8881526803ecf6044b7e90e6af8f7a485cd480 100644 --- a/models/scop_adhesion_file.py +++ b/models/scop_adhesion_file.py @@ -8,10 +8,11 @@ class ScopAdhesionFiles(models.Model): _name = "scop.adhesion.file" _description = "Documents pour adhésion des coops" - name = fields.Char("Nom du fichier") + name = fields.Char("Nom du fichier", required=True) coop_type_id = fields.Many2one( comodel_name="res.partner.cooperative.form", string="Type de coopérative", + required=True, ) is_compulsory = fields.Boolean("Obligatoire") type_process = fields.Selection(