diff --git a/models/account_invoice.py b/models/account_invoice.py index 0bf8bc6b42a1655da6a66d7a56d6d446b8549829..b8c7e828bc0d64344d0483b78f2232874293c81d 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 dcff4c48616d376fb95a3a2c8f34fddde6b29eb5..8d9183757ed6ccf2708ae9c34260b2eb4148d5d1 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 be934a378dc0c2eadf192f0467f3753f85b38b39..69eccf4c925d77f8dd004553a234b911b295b77c 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 4076ca178cfca4599387824c6530833774dd2b2d..3036158d1fb29b8ea23e0c46c41a87c02e21f711 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(