From 4b8f72eb2315e675ca6d5a0d0961272fc024c475 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 13 Jun 2019 11:05:24 +0000 Subject: [PATCH] [FIX] hr_payroll_account: analytic account - Set an analytic account on an employee contract - Set credit and debit accounts on the salary rules - Create a payslip, confirm The journal items created do not use the analytic account set on the contract. If no analytic account is set on the salary rule, we fall back on the contract account. opw-2006090 closes odoo/odoo#34095 Signed-off-by: Nicolas Martinelli (nim) --- addons/hr_payroll_account/models/hr_payroll_account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_payroll_account/models/hr_payroll_account.py b/addons/hr_payroll_account/models/hr_payroll_account.py index d8dc6916abf..4f14390f048 100644 --- a/addons/hr_payroll_account/models/hr_payroll_account.py +++ b/addons/hr_payroll_account/models/hr_payroll_account.py @@ -85,7 +85,7 @@ class HrPayslip(models.Model): 'date': date, 'debit': amount > 0.0 and amount or 0.0, 'credit': amount < 0.0 and -amount or 0.0, - 'analytic_account_id': line.salary_rule_id.analytic_account_id.id, + 'analytic_account_id': line.salary_rule_id.analytic_account_id.id or slip.contract_id.analytic_account_id.id, 'tax_line_id': line.salary_rule_id.account_tax_id.id, }) line_ids.append(debit_line) @@ -100,7 +100,7 @@ class HrPayslip(models.Model): 'date': date, 'debit': amount < 0.0 and -amount or 0.0, 'credit': amount > 0.0 and amount or 0.0, - 'analytic_account_id': line.salary_rule_id.analytic_account_id.id, + 'analytic_account_id': line.salary_rule_id.analytic_account_id.id or slip.contract_id.analytic_account_id.id, 'tax_line_id': line.salary_rule_id.account_tax_id.id, }) line_ids.append(credit_line)