diff --git a/models/res_partner.py b/models/res_partner.py index 00e5b5ea2408789a9536960d4b0bebe80db47709..7c6ad2efea73bf051d141d5a283ae84b44dc6b66 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -237,18 +237,27 @@ class ScopPartner(models.Model): """ self.ensure_one() lm_adhesion = self.get_lm_adhesion() + + errors = str() errors_complete_fields = self.check_compulsory_fields(lm_adhesion) + if errors_complete_fields: + errors += errors_complete_fields errors_complete_docs = self.check_compulsory_docs() - if errors_complete_fields or errors_complete_docs: + if errors_complete_docs: + errors_str = str() + for error in errors_complete_docs: + errors_str += "<li>" + error + "</li>" + errors += '<hr/><strong>Documents manquants :</strong><ul>' + \ + errors_str + '</ul>' + if errors: local_tz = timezone('Europe/Paris') utc_tz = timezone('UTC') - self.list_logs = '<strong>' + \ - utc_tz.localize( - fields.Datetime.now()).astimezone( - local_tz).strftime("%d/%m/%Y - %-H:%M") + \ - '</strong> - Impossible de soumettre le' \ - ' dossier à la CG Scop' + \ - errors_complete_fields + errors_complete_docs + self.list_logs = \ + '<strong>' + utc_tz.localize( + fields.Datetime.now()).astimezone(local_tz).strftime( + "%d/%m/%Y - %-H:%M") + \ + '</strong> - Impossible de soumettre le dossier à la CG Scop' \ + + errors return False else: self.list_logs = False @@ -275,12 +284,11 @@ class ScopPartner(models.Model): Vérification de la présence des docs obligatoires :return: """ - errors = '' + errors = list() if errors: - res = '<hr/><strong>Documents manquants :</strong><ul>' + errors + '</ul>' - return res + return errors else: - return str() + return False @api.multi def create_num_adherent(self):