diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py index cd84729c9e4610b7f48bcfebd9aa9c85215454a2..fd5f9dfeb7f132155e6d26f2f4f933ae0af0dedf 100644 --- a/models/scop_bordereau_cg.py +++ b/models/scop_bordereau_cg.py @@ -130,7 +130,7 @@ class Bordereau(models.Model): string="Cotisation CG Scop", currency_field="company_currency_id", compute="_compute_amount_cg", - store=True + store=True, ) amount_residual = fields.Monetary( string="Montant dû", @@ -439,7 +439,7 @@ class Bordereau(models.Model): inv.update( { "payment_mode_id": self.payment_mode_id, - 'invoice_date_due': quarters[int(inv.cotiz_quarter) - 1] + "invoice_date_due": quarters[int(inv.cotiz_quarter) - 1], } ) if self.is_sdd and not inv.mandate_id: diff --git a/models/scop_cotisation_cg.py b/models/scop_cotisation_cg.py index c53ad478981abb137655d60d4892781090adb9ba..582240bc623efa4807c08df6460c3c5a7ad50508 100644 --- a/models/scop_cotisation_cg.py +++ b/models/scop_cotisation_cg.py @@ -541,7 +541,9 @@ class ScopCotisation(models.Model): ) # Construction Tableau - liasse.read(["L2052_FL", "av_cg", "av_lf", "revenue_cg", "L2052_FY", "wage_cg"]) + liasse.read( + ["L2052_FL", "av_cg", "av_lf", "revenue_cg", "L2052_FY", "wage_cg"] + ) datas_contrib = [ m.member_number, m.ur_id.name, diff --git a/models/scop_liasse_fiscale.py b/models/scop_liasse_fiscale.py index fc65061755c2802d40ca8079e4a11b30d2591563..92b5dbf87bfa40add1cfa10b3c734449716a2d20 100644 --- a/models/scop_liasse_fiscale.py +++ b/models/scop_liasse_fiscale.py @@ -349,7 +349,7 @@ class ScopLiasseFiscale(models.Model): def get_assiette(self): # Calcul VA - self.read(['av_lf', 'av_cg', 'L2052_FL']) + self.read(["av_lf", "av_cg", "L2052_FL"]) va = self.av_lf if self.av_lf > 0 else self.av_cg ca = self.L2052_FL if self.dureeExercice and self.dureeExercice not in (0, 12): @@ -359,21 +359,17 @@ class ScopLiasseFiscale(models.Model): # Calcul Type Assiette if ca > 0 and va > 0: if ca <= va * 7 / 3: - contribution_base_type = 'ca' - contribution_base_amount = ca + contribution_base_type = "ca" else: - contribution_base_type = 'va' - contribution_base_amount = va + contribution_base_type = "va" else: if va > 0: - contribution_base_type = 'va' - contribution_base_amount = va + contribution_base_type = "va" else: - contribution_base_type = 'ca' - contribution_base_amount = ca + contribution_base_type = "ca" # Calcul Cotisation CG Scop - if contribution_base_type == 'ca': + if contribution_base_type == "ca": rate = self.get_rate_ca(self.partner_id) contribution = ca * rate else: diff --git a/wizard/scop_bordereau_refund_wizard.py b/wizard/scop_bordereau_refund_wizard.py index 26d0cd9a57ace1c4987e050ad119f9cd6651b948..4683458dde646d307d37c2a3e5db7e8bdce649d5 100644 --- a/wizard/scop_bordereau_refund_wizard.py +++ b/wizard/scop_bordereau_refund_wizard.py @@ -159,18 +159,18 @@ class ScopBordereauRefundWizard(models.TransientModel): self.env.ref("cgscop_partner.riga_14398").id: [ self.env.company.contribution_fede_com_id, self.env.user.company_id.journal_fede_com_id, - partner_id.property_account_receivable_id + partner_id.property_account_receivable_id, ], self.env.ref("cgscop_partner.cotiz_fede_cae").id: [ self.env.company.contribution_fede_cae_id, self.env.user.company_id.journal_fede_cae_id, - partner_id.property_account_receivable_id + partner_id.property_account_receivable_id, ], self.env.ref("cgscop_partner.riga_14399").id: [ product_ur, self.env.company.contribution_ur_or_fede_journal_id, journal_ur, - partner_id.property_account_receivable_id + partner_id.property_account_receivable_id, ], } product = cotiz_type.get(int(self.type_cotiz))[0] diff --git a/wizard/scop_cotisation_cg_regul.py b/wizard/scop_cotisation_cg_regul.py index 266a4fd7b9a498dbae2e3d491d8155a2aa00503e..de2a36e1ed4e5949e9e3967f9bec22ef3a46ac09 100644 --- a/wizard/scop_cotisation_cg_regul.py +++ b/wizard/scop_cotisation_cg_regul.py @@ -189,19 +189,19 @@ class ScopCotisationRegul(models.TransientModel): self.amount_fede_com, self.env.company.contribution_fede_com_id, self.env.user.company_id.journal_fede_com_id, - partner_id.property_account_receivable_id.id + partner_id.property_account_receivable_id.id, ], self.env.ref("cgscop_partner.cotiz_fede_cae").id: [ self.amount_fede_cae, self.env.company.contribution_fede_cae_id, self.env.user.company_id.journal_fede_cae_id, - partner_id.property_account_receivable_id.id + partner_id.property_account_receivable_id.id, ], self.env.ref("cgscop_partner.riga_14399").id: [ amount_ur, product_ur, journal_ur, - partner_id.property_account_receivable_id.id + partner_id.property_account_receivable_id.id, ], }