From 0da738dc8cf1040b8c7d956cb6042f2c042b8be7 Mon Sep 17 00:00:00 2001 From: Kinjal Mehta Date: Wed, 6 Dec 2017 14:41:30 +0530 Subject: [PATCH] [IMP] l10n_be_hr_payroll,l10n_ch: changed duplicate field label in the same model --- addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py | 2 +- addons/l10n_ch/models/account_invoice.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py index 1b9835b1624..8665d2bdc46 100644 --- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py +++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py @@ -36,7 +36,7 @@ class HrContract(models.Model): company_car_total_depreciated_cost = fields.Monetary() public_transport_reimbursed_amount = fields.Monetary(string='Reimbursed amount', compute='_compute_public_transport_reimbursed_amount', readonly=False, store=True) - others_reimbursed_amount = fields.Monetary(string='Reimbursed amount') + others_reimbursed_amount = fields.Monetary(string='Other Reimbursed amount') transport_employer_cost = fields.Monetary(compute='_compute_transport_employer_cost', string="Employer cost from employee transports") warrants_cost = fields.Monetary(compute='_compute_warrants_cost') diff --git a/addons/l10n_ch/models/account_invoice.py b/addons/l10n_ch/models/account_invoice.py index 928e5887415..20888252b26 100644 --- a/addons/l10n_ch/models/account_invoice.py +++ b/addons/l10n_ch/models/account_invoice.py @@ -26,7 +26,7 @@ class AccountInvoice(models.Model): l10n_ch_isr_valid = fields.Boolean(compute='_compute_l10n_ch_isr_valid', help='Boolean value. True iff all the data required to generate the ISR are present') l10n_ch_isr_sent = fields.Boolean(defaut=False, help="Boolean value telling whether or not the ISR corresponding to this invoice has already been printed or sent by mail.") - l10n_ch_currency_name = fields.Char(related='currency_id.name', help="The name of this invoice's currency") #This field is used in the "invisible" condition field of the 'Print ISR' button. + l10n_ch_currency_name = fields.Char(related='currency_id.name', string="Invoice Currency", help="The name of this invoice's currency") #This field is used in the "invisible" condition field of the 'Print ISR' button. @api.depends('partner_bank_id.bank_id.l10n_ch_postal_eur', 'partner_bank_id.bank_id.l10n_ch_postal_chf') def _compute_l10n_ch_isr_postal(self):