From 4ed9a53bbd602c219b74fc1192555d16453fff7d Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 10 Sep 2018 00:23:04 -0400 Subject: [PATCH] [FIX] hr_payroll_account: Allow salary rules to be used in multicompanies Before this commit - Install a **l10n_xx_hr_payroll** which includes information of the rules (it always install in the main company: **Company A** in this use case). - Configure the accounting for the rules - Create **Company B** - Use the same salary rules for both companies, as **l10n_xx_hr_payroll** modules are not multicompany. Behavior: - **Company A** accounts are shown in **Company B** salary rules. - If the accounts are changed in **Company B** rules, it also overrides **Company A** accounts, (which causes major confusions, and great mistakes if a payslip is run). - A salary rule with **Company A** set on `company_id` can still be **seen** through Company B. which causes that it can be mistakenly _ran by a user in Company B_, with the _accounting of Company A_. After this commit: Salary rules accounting can be used with multi-company --- addons/hr_payroll_account/models/hr_payroll_account.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_payroll_account/models/hr_payroll_account.py b/addons/hr_payroll_account/models/hr_payroll_account.py index 430396bbcc2..c2b80fc744f 100644 --- a/addons/hr_payroll_account/models/hr_payroll_account.py +++ b/addons/hr_payroll_account/models/hr_payroll_account.py @@ -145,10 +145,10 @@ class HrPayslip(models.Model): class HrSalaryRule(models.Model): _inherit = 'hr.salary.rule' - analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account') - account_tax_id = fields.Many2one('account.tax', 'Tax') - account_debit = fields.Many2one('account.account', 'Debit Account', domain=[('deprecated', '=', False)]) - account_credit = fields.Many2one('account.account', 'Credit Account', domain=[('deprecated', '=', False)]) + analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account', company_dependent=True) + account_tax_id = fields.Many2one('account.tax', 'Tax', company_dependent=True) + account_debit = fields.Many2one('account.account', 'Debit Account', company_dependent=True, domain=[('deprecated', '=', False)]) + account_credit = fields.Many2one('account.account', 'Credit Account', company_dependent=True, domain=[('deprecated', '=', False)]) class HrContract(models.Model): _inherit = 'hr.contract'