From ea45f0fed5320e96bb257dd774339af18742c3b2 Mon Sep 17 00:00:00 2001 From: jordan <jordan@le-filament.com> Date: Tue, 14 Dec 2021 16:11:09 +0100 Subject: [PATCH] [fix] warning due to label --- models/account_invoice.py | 4 ++-- models/scop_bordereau_cg.py | 2 +- wizard/scop_bordereau_update_liasse_wizard.py | 2 ++ wizard/scop_cotisation_cg_regul.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/models/account_invoice.py b/models/account_invoice.py index 0bf8bc6..b8c7e82 100644 --- a/models/account_invoice.py +++ b/models/account_invoice.py @@ -15,8 +15,8 @@ class ScopAccountInvoiceCG(models.Model): cotisation_cg_id = fields.Many2one( related='bordereau_id.base_cotisation_cg') amount_cg_calculated = fields.Monetary( - string="Montant calculé annuel", currency_field='company_currency_id', - readonly=True) + string="Montant cotisation annuel", + currency_field='company_currency_id', readonly=True) nb_quarter = fields.Selection(related='bordereau_id.nb_quarter') cotiz_quarter = fields.Selection( string='Trimestre', diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py index dcff4c4..8d91837 100644 --- a/models/scop_bordereau_cg.py +++ b/models/scop_bordereau_cg.py @@ -111,7 +111,7 @@ class Bordereau(models.Model): compute='_compute_amount_residual', store=True) nb_quarter = fields.Selection( - string='Nombre de trimestres de cotisation', + string='Nb de trimestres de cotisation', selection=[(1, '1'), (2, '2'), (3, '3'), diff --git a/wizard/scop_bordereau_update_liasse_wizard.py b/wizard/scop_bordereau_update_liasse_wizard.py index be934a3..69eccf4 100644 --- a/wizard/scop_bordereau_update_liasse_wizard.py +++ b/wizard/scop_bordereau_update_liasse_wizard.py @@ -39,8 +39,10 @@ class ScopBordereauChangeLiasse(models.TransientModel): amount_fede_cae = fields.Float( 'Cotisation Fede CAE actuelle', compute='_compute_amount_cotiz') type_assiette = fields.Selection( + string='Type d\'assiette', related='bordereau_id.type_assiette',) montant_assiette = fields.Integer( + string='Montant de l\'assiette', related='bordereau_id.montant_assiette') ca = fields.Float( related='bordereau_id.ca') diff --git a/wizard/scop_cotisation_cg_regul.py b/wizard/scop_cotisation_cg_regul.py index 4076ca1..3036158 100644 --- a/wizard/scop_cotisation_cg_regul.py +++ b/wizard/scop_cotisation_cg_regul.py @@ -27,7 +27,7 @@ class ScopCotisationRegul(models.TransientModel): # Old liasse liasse_fiscale_id = fields.Many2one( comodel_name='scop.liasse.fiscale', - string='Liasse Fiscale', + string='Liasse Fiscale de référence', ) year = fields.Integer('Année de la liasse') type_assiette_retenu = fields.Selection( -- GitLab