diff --git a/controllers/main.py b/controllers/main.py index 8c6b946a2cec9159edd2d1283bb660ce436eb159..9d9d68c93ac1c57d7f32d72fae3feb538a5070e0 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -273,9 +273,12 @@ class ExportJournalCg(http.Controller): return line.debit def _get_partner_number(self, partner): - number = partner.member_number + "00" - prefix = 8 - len(number) - return (prefix * "0") + number + if partner.member_number: + number = partner.member_number + "00" + prefix = 8 - len(number) + return (prefix * "0") + number + else: + return "" def export_cg_csv(self, lines_to_export, filename_): fp = StringIO() diff --git a/datas/mail_data.xml b/datas/mail_data.xml index 7cd10391b046371e405d07bc9f40c771760c33d5..847ec0bdbecbeb6ab1eae224c0430fac04d08fc6 100644 --- a/datas/mail_data.xml +++ b/datas/mail_data.xml @@ -20,7 +20,11 @@ <p style="margin: 0px; padding: 0px; font-size: 13px;"> <p>Chère Coopératrice, Cher Coopérateur,</p> - <p>Votre appel de cotisation ${object.year} est disponible sur <a href="https://extranet.scop.coop">votre espace extranet</a>. Vous pourrez le télécharger dans la rubrique <b>Ma bibliothèque de documents</b>.</p> + <p + >Votre appel de cotisation ${object.year} est disponible sur <a + href="https://extranet.scop.coop" + >votre espace extranet</a>. Vous pourrez le télécharger dans la rubrique <b + >Ma bibliothèque de documents</b>.</p> <p >Vous pouvez également télécharger le lien du bordereau de cotisation à l'Union sociale en cliquant sur le lien suivant : <a diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py index 7662d8e336c2c47440a47aaa593d7c7b416a0d94..ad83fc6ed575d7f47d972925f805ffbf7e25f9fd 100644 --- a/models/scop_bordereau_cg.py +++ b/models/scop_bordereau_cg.py @@ -43,9 +43,10 @@ class Bordereau(models.Model): tracking=1, ) member_number = fields.Integer( - string="N° Adhérent", related="partner_id.member_number_int", + string="N° Adhérent", + related="partner_id.member_number_int", store=True, - index=True + index=True, ) liasse_fiscale_id = fields.Many2one( comodel_name="scop.liasse.fiscale", @@ -126,9 +127,9 @@ class Bordereau(models.Model): store=True, ) amount_total_cg = fields.Monetary( - string='Cotisation CG Scop', - currency_field='company_currency_id', - compute='_compute_amount_cg', + string="Cotisation CG Scop", + currency_field="company_currency_id", + compute="_compute_amount_cg", ) amount_residual = fields.Monetary( string="Montant dû", @@ -290,7 +291,7 @@ class Bordereau(models.Model): r.amount_total_cotiz = sum(r.invoice_ids.mapped("amount_total_signed")) def _compute_amount_cg(self): - type_cotisation_cg = self.env.ref('cgscop_partner.riga_14397') + type_cotisation_cg = self.env.ref("cgscop_partner.riga_14397") for r in self: contrib_cg_ids = r.invoice_ids.filtered( lambda i: i.type_contribution_id == type_cotisation_cg diff --git a/views/scop_bordereau_cg.xml b/views/scop_bordereau_cg.xml index 309ca912b96e1c63e11e2f6ff2bdda3c1f7d3994..b536f3d39a79eb4cdffa7e69ead3a7fc4de095e2 100644 --- a/views/scop_bordereau_cg.xml +++ b/views/scop_bordereau_cg.xml @@ -354,9 +354,9 @@ <field name="partner_id" /> <field name="partner_ur_id" /> <field name="state" /> - <field name="type_assiette" string="Assiette"/> - <field name="montant_assiette" string="Montant Assiette"/> - <field name="amount_total_cg"/> + <field name="type_assiette" string="Assiette" /> + <field name="montant_assiette" string="Montant Assiette" /> + <field name="amount_total_cg" /> <field name="amount_total_cotiz" sum="Total" /> <field name="amount_residual" sum="Total" /> <field name="year" optional="hide" /> diff --git a/wizard/scop_bordereau_payment_mode_wizard.py b/wizard/scop_bordereau_payment_mode_wizard.py index bdf2de30cf1da44d5ffba0fb9dcb32ca0f01b8d0..09c77ee72e1908a148c399caa32f6228e4539dc8 100644 --- a/wizard/scop_bordereau_payment_mode_wizard.py +++ b/wizard/scop_bordereau_payment_mode_wizard.py @@ -53,9 +53,7 @@ class ScopBordereauChangePaymentMode(models.TransientModel): } ) contrib_cg_journal = self.env.company.contribution_journal_id - contrib_ur_fede_journal = ( - self.env.company.contribution_ur_or_fede_journal_id - ) + contrib_ur_fede_journal = self.env.company.contribution_ur_or_fede_journal_id move_line_ids = self.env["account.move.line"].search( [ ("partner_id", "=", self.bordereau_id.partner_id.id),