From 3193d1cbb792064a359262335d7356933486c6a8 Mon Sep 17 00:00:00 2001 From: votrelec Date: Mon, 9 Nov 2026 14:16:08 +0100 Subject: [PATCH 1/2] [FIX] payroll_account: preserve accounting links during reset, calculation and confirmation --- payroll_account/__manifest__.py | 2 +- payroll_account/i18n/payroll_account.pot | 40 +++++++++- payroll_account/i18n/sk.po | 60 +++++++++----- payroll_account/models/hr_payslip.py | 29 +++++++ payroll_account/readme/CONTRIBUTORS.md | 1 + payroll_account/readme/DESCRIPTION.md | 5 ++ payroll_account/tests/test_payroll_account.py | 78 +++++++++++++++++++ 7 files changed, 191 insertions(+), 24 deletions(-) diff --git a/payroll_account/__manifest__.py b/payroll_account/__manifest__.py index a4185b801..b91ac7215 100644 --- a/payroll_account/__manifest__.py +++ b/payroll_account/__manifest__.py @@ -1,7 +1,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. { "name": "Payroll Accounting", - "version": "19.0.1.0.0", + "version": "19.0.1.0.1", "category": "Payroll", "website": "https://github.com/OCA/payroll", "license": "LGPL-3", diff --git a/payroll_account/i18n/payroll_account.pot b/payroll_account/i18n/payroll_account.pot index 5259141a4..c12026164 100644 --- a/payroll_account/i18n/payroll_account.pot +++ b/payroll_account/i18n/payroll_account.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 18.0\n" +"Project-Id-Version: Odoo Server 19.0-20261102\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-11-09 13:13+0000\n" +"PO-Revision-Date: 2026-11-09 13:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,9 +33,10 @@ msgid "Adjustment Entry" msgstr "" #. module: payroll_account -#: model:ir.model.fields,field_description:payroll_account.field_hr_contract__analytic_account_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_employee__analytic_account_id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__analytic_account_id #: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__analytic_account_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__analytic_account_id msgid "Analytic Account" msgstr "" @@ -61,7 +64,17 @@ msgid "Debit Account" msgstr "" #. module: payroll_account -#: model:ir.model,name:payroll_account.model_hr_contract +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__display_name +msgid "Display Name" +msgstr "" + +#. module: payroll_account +#: model:ir.model,name:payroll_account.model_hr_version msgid "Employee Contract" msgstr "" @@ -70,6 +83,16 @@ msgstr "" msgid "Generate payslips for all selected employees" msgstr "" +#. module: payroll_account +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__id +msgid "ID" +msgstr "" + #. module: payroll_account #: model:ir.model.fields,help:payroll_account.field_hr_payslip__date msgid "Keep empty to use the period of the validation(Payslip) date." @@ -97,9 +120,10 @@ msgid "Payslip of %s" msgstr "" #. module: payroll_account -#: model:ir.model.fields,field_description:payroll_account.field_hr_contract__journal_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_employee__journal_id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__journal_id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__journal_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__journal_id msgid "Salary Journal" msgstr "" @@ -131,3 +155,11 @@ msgstr "" #: code:addons/payroll_account/models/hr_payslip.py:0 msgid "The Expense Journal \"%s\" has not properly configured the Debit Account!" msgstr "" + +#. module: payroll_account +#. odoo-python +#: code:addons/payroll_account/models/hr_payslip.py:0 +msgid "" +"This payslip has an accounting entry. Use the payroll cancellation or " +"correction workflow before resetting or recalculating it." +msgstr "" diff --git a/payroll_account/i18n/sk.po b/payroll_account/i18n/sk.po index 7cbeec915..756876abb 100644 --- a/payroll_account/i18n/sk.po +++ b/payroll_account/i18n/sk.po @@ -20,8 +20,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n " -">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n>=2 && n<=4 ? 1 : 2);\n" #. module: payroll_account #: model_terms:ir.ui.view,arch_db:payroll_account.hr_contract_view_form @@ -37,14 +36,14 @@ msgstr "Účtovný vstup" #. module: payroll_account #. odoo-python #: code:addons/payroll_account/models/hr_payslip.py:0 -#, python-format msgid "Adjustment Entry" msgstr "Úpravný vstup" #. module: payroll_account -#: model:ir.model.fields,field_description:payroll_account.field_hr_contract__analytic_account_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_employee__analytic_account_id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__analytic_account_id #: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__analytic_account_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__analytic_account_id msgid "Analytic Account" msgstr "Analytický účet" @@ -54,12 +53,6 @@ msgstr "Analytický účet" msgid "Base" msgstr "" -#. module: payroll_account -#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__company_id -#: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__company_id -msgid "Company" -msgstr "" - #. module: payroll_account #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__account_credit #: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__account_credit @@ -78,7 +71,7 @@ msgid "Debit Account" msgstr "Debetný účet" #. module: payroll_account -#: model:ir.model,name:payroll_account.model_hr_contract +#: model:ir.model,name:payroll_account.model_hr_version msgid "Employee Contract" msgstr "Zmluva zamestnanca" @@ -111,14 +104,14 @@ msgstr "Payslip Line " #. module: payroll_account #. odoo-python #: code:addons/payroll_account/models/hr_payslip.py:0 -#, python-format msgid "Payslip of %s" msgstr "Výplatná páska %s" #. module: payroll_account -#: model:ir.model.fields,field_description:payroll_account.field_hr_contract__journal_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_employee__journal_id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__journal_id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__journal_id +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__journal_id msgid "Salary Journal" msgstr "Účtovná kniha výplat" @@ -142,18 +135,47 @@ msgstr "" #. module: payroll_account #. odoo-python #: code:addons/payroll_account/models/hr_payslip.py:0 -#, python-format -msgid "" -"The Expense Journal \"%s\" has not properly configured the Credit Account!" +msgid "The Expense Journal \"%s\" has not properly configured the Credit Account!" msgstr "Účtovná kniha výdajov \"%s\" nemá správne nastavený kreditný účet!" #. module: payroll_account #. odoo-python #: code:addons/payroll_account/models/hr_payslip.py:0 -#, python-format -msgid "" -"The Expense Journal \"%s\" has not properly configured the Debit Account!" +msgid "The Expense Journal \"%s\" has not properly configured the Debit Account!" msgstr "Účtovná kniha výdajov \"%s\" nemá správne nastavený debetný účet!" +#. module: payroll_account +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__display_name +msgid "Display Name" +msgstr "" + +#. module: payroll_account +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_version__id +msgid "ID" +msgstr "" + +#. module: payroll_account +#. odoo-python +#: code:addons/payroll_account/models/hr_payslip.py:0 +msgid "" +"This payslip has an accounting entry. Use the payroll cancellation or " +"correction workflow before resetting or recalculating it." +msgstr "" +"Táto výplatná páska má účtovný zápis. Pred návratom do návrhu alebo " +"prepočtom použite postup zrušenia alebo opravy mzdy." + +#~ msgid "Company" +#~ msgstr "" + #~ msgid "Pay Slip" #~ msgstr "Pay Slip " diff --git a/payroll_account/models/hr_payslip.py b/payroll_account/models/hr_payslip.py index 29c554b9e..8f48b8451 100644 --- a/payroll_account/models/hr_payslip.py +++ b/payroll_account/models/hr_payslip.py @@ -64,7 +64,36 @@ def action_payslip_cancel(self): payslip.move_id = False return super().action_payslip_cancel() + def _check_no_accounting_entry(self): + """Reset/recalculation does not reverse an existing journal entry.""" + self.check_access("write") + if self: + self.env.cr.execute( + "SELECT id FROM hr_payslip WHERE id IN %s ORDER BY id FOR UPDATE", + [tuple(sorted(self.ids))], + ) + self.invalidate_recordset() + if self.filtered("move_id"): + raise UserError( + self.env._( + "This payslip has an accounting entry. Use the payroll " + "cancellation or correction workflow before resetting " + "or recalculating it." + ) + ) + + def compute_sheet(self): + self._check_no_accounting_entry() + return super().compute_sheet() + + def action_payslip_draft(self): + self._check_no_accounting_entry() + return super().action_payslip_draft() + def action_payslip_done(self): + # Do not rely on compute_sheet: without_compute_sheet and + # prevent_compute_on_confirm legitimately skip that method. + self._check_no_accounting_entry() res = super().action_payslip_done() for slip in self: diff --git a/payroll_account/readme/CONTRIBUTORS.md b/payroll_account/readme/CONTRIBUTORS.md index 394233a5e..680ae2024 100644 --- a/payroll_account/readme/CONTRIBUTORS.md +++ b/payroll_account/readme/CONTRIBUTORS.md @@ -1,3 +1,4 @@ - Odoo SA \<\> - Saran Lim. \<\> - Daniel Reis \<\> +- votrelec diff --git a/payroll_account/readme/DESCRIPTION.md b/payroll_account/readme/DESCRIPTION.md index 190b1b44a..f39a851c4 100644 --- a/payroll_account/readme/DESCRIPTION.md +++ b/payroll_account/readme/DESCRIPTION.md @@ -3,3 +3,8 @@ Generic Payroll system Integrated with Accounting. This module is a backport from Odoo SA and as such, it is not included in the OCA CLA. That means we do not have a copy of the copyright on it like all other OCA modules. + +An existing accounting entry prevents a direct reset or recalculation of the +payslip. Use the payroll cancellation or correction workflow first so salary +lines cannot silently diverge from the journal entry. Payslips without an +accounting entry can still be reset and calculated normally. diff --git a/payroll_account/tests/test_payroll_account.py b/payroll_account/tests/test_payroll_account.py index 2e3d71b02..4d6c22d15 100644 --- a/payroll_account/tests/test_payroll_account.py +++ b/payroll_account/tests/test_payroll_account.py @@ -10,6 +10,83 @@ class TestPayrollAccount(common.TransactionCase): + def _posted_lifecycle_slip(self): + self._update_account_in_rule(self.account_debit, self.account_credit) + payslip = self._prepare_payslip(self.hr_employee_john) + payslip.journal_id = self.account_journal + payslip.compute_sheet() + payslip.action_payslip_done() + self.assertEqual(payslip.move_id.state, "posted") + return payslip + + def test_recompute_preserves_posted_salary_and_journal_entry(self): + payslip = self._posted_lifecycle_slip() + before = [(line.id, line.code, line.total) for line in payslip.line_ids] + move = payslip.move_id + move_lines = move.line_ids.ids + payslip.contract_id.wage += 100 + with self.assertRaises(UserError): + payslip.compute_sheet() + self.assertEqual(payslip.state, "done") + self.assertEqual( + [(line.id, line.code, line.total) for line in payslip.line_ids], before + ) + self.assertEqual(payslip.move_id, move) + self.assertEqual(move.line_ids.ids, move_lines) + + def test_reset_preserves_posted_salary_state_and_entry(self): + payslip = self._posted_lifecycle_slip() + with self.assertRaises(UserError): + payslip.action_payslip_draft() + self.assertEqual(payslip.state, "done") + self.assertEqual(payslip.move_id.state, "posted") + + def test_mixed_batch_refuses_before_recalculating_a_draft(self): + posted = self._posted_lifecycle_slip() + draft = self._prepare_payslip(self.hr_employee_john) + before = [(line.id, line.code, line.total) for line in draft.line_ids] + for method in ("compute_sheet", "action_payslip_draft"): + with self.assertRaises(UserError): + getattr(draft | posted, method)() + self.assertEqual( + [(line.id, line.code, line.total) for line in draft.line_ids], before + ) + self.assertEqual(posted.state, "done") + + def test_reset_without_accounting_entry_remains_available(self): + payslip = self._prepare_payslip(self.hr_employee_john) + payslip.journal_id = self.account_journal + payslip.compute_sheet() + payslip.action_payslip_done() + self.assertFalse(payslip.move_id) + payslip.action_payslip_draft() + payslip.compute_sheet() + self.assertEqual(payslip.state, "verify") + + def test_confirmation_without_recompute_cannot_create_another_entry(self): + payslip = self._posted_lifecycle_slip() + before = self.env["account.move"].search_count([]) + original = payslip.move_id + with self.assertRaises(UserError): + payslip.with_context(without_compute_sheet=True).action_payslip_done() + self.assertEqual(self.env["account.move"].search_count([]), before) + self.assertEqual(payslip.move_id, original) + + def test_credit_note_uses_a_separate_accounting_entry(self): + posted = self._posted_lifecycle_slip() + original_move = posted.move_id + refund = posted.copy({"credit_note": True}) + refund.compute_sheet() + refund.action_payslip_done() + self.assertEqual(refund.move_id.state, "posted") + self.assertNotEqual(refund.move_id, original_move) + count = self.env["account.move"].search_count([]) + for context in ({}, {"without_compute_sheet": True}): + with self.assertRaises(UserError): + posted.with_context(**context).action_payslip_done() + self.assertEqual(self.env["account.move"].search_count([]), count) + self.assertEqual(posted.move_id, original_move) + def setUp(self): super().setUp() @@ -143,6 +220,7 @@ def _prepare_payslip(self, employee): "employee_id": self.hr_employee_john.id, "contract_id": self.hr_contract_john.id, "struct_id": self.hr_structure_softwaredeveloper.id, + "journal_id": self.account_journal.id, } ) res = self.hr_payslip.get_payslip_vals(date_from, date_to, employee.id) From 824c725df6acdb71daf8d3aecad6470788208e11 Mon Sep 17 00:00:00 2001 From: votrelec Date: Mon, 9 Nov 2026 16:56:00 +0100 Subject: [PATCH 2/2] fix(payroll_account): preserve accounted salary inputs and identity --- payroll_account/i18n/payroll_account.pot | 25 +++++- payroll_account/i18n/sk.po | 21 +++++ payroll_account/models/__init__.py | 1 + payroll_account/models/hr_payslip.py | 11 ++- payroll_account/models/hr_payslip_line.py | 6 +- payroll_account/models/payroll_child_guard.py | 45 ++++++++++ payroll_account/readme/DESCRIPTION.md | 6 ++ payroll_account/tests/test_payroll_account.py | 87 ++++++++++++++++++- 8 files changed, 197 insertions(+), 5 deletions(-) create mode 100644 payroll_account/models/payroll_child_guard.py diff --git a/payroll_account/i18n/payroll_account.pot b/payroll_account/i18n/payroll_account.pot index c12026164..613a49090 100644 --- a/payroll_account/i18n/payroll_account.pot +++ b/payroll_account/i18n/payroll_account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 19.0-20261102\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-11-09 13:13+0000\n" -"PO-Revision-Date: 2026-11-09 13:13+0000\n" +"POT-Creation-Date: 2026-11-09 15:55+0000\n" +"PO-Revision-Date: 2026-11-09 15:55+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: payroll_account +#: model:ir.model,name:payroll_account.model_payroll_account_child_guard +msgid "Accounted Payroll Child Guard" +msgstr "" + #. module: payroll_account #: model_terms:ir.ui.view,arch_db:payroll_account.hr_contract_view_form #: model_terms:ir.ui.view,arch_db:payroll_account.hr_salary_rule_view_form @@ -66,10 +71,13 @@ msgstr "" #. module: payroll_account #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_input__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_worked_days__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_version__display_name +#: model:ir.model.fields,field_description:payroll_account.field_payroll_account_child_guard__display_name msgid "Display Name" msgstr "" @@ -86,10 +94,13 @@ msgstr "" #. module: payroll_account #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_input__id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_worked_days__id #: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__id #: model:ir.model.fields,field_description:payroll_account.field_hr_version__id +#: model:ir.model.fields,field_description:payroll_account.field_payroll_account_child_guard__id msgid "ID" msgstr "" @@ -108,11 +119,21 @@ msgstr "" msgid "Payslip Batches" msgstr "" +#. module: payroll_account +#: model:ir.model,name:payroll_account.model_hr_payslip_input +msgid "Payslip Input" +msgstr "" + #. module: payroll_account #: model:ir.model,name:payroll_account.model_hr_payslip_line msgid "Payslip Line" msgstr "" +#. module: payroll_account +#: model:ir.model,name:payroll_account.model_hr_payslip_worked_days +msgid "Payslip Worked Days" +msgstr "" + #. module: payroll_account #. odoo-python #: code:addons/payroll_account/models/hr_payslip.py:0 diff --git a/payroll_account/i18n/sk.po b/payroll_account/i18n/sk.po index 756876abb..4717cc04e 100644 --- a/payroll_account/i18n/sk.po +++ b/payroll_account/i18n/sk.po @@ -147,20 +147,26 @@ msgstr "Účtovná kniha výdajov \"%s\" nemá správne nastavený debetný úč #. module: payroll_account #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_input__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__display_name +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_worked_days__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__display_name #: model:ir.model.fields,field_description:payroll_account.field_hr_version__display_name +#: model:ir.model.fields,field_description:payroll_account.field_payroll_account_child_guard__display_name msgid "Display Name" msgstr "" #. module: payroll_account #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip__id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_employees__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_input__id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_line__id #: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_run__id +#: model:ir.model.fields,field_description:payroll_account.field_hr_payslip_worked_days__id #: model:ir.model.fields,field_description:payroll_account.field_hr_salary_rule__id #: model:ir.model.fields,field_description:payroll_account.field_hr_version__id +#: model:ir.model.fields,field_description:payroll_account.field_payroll_account_child_guard__id msgid "ID" msgstr "" @@ -174,6 +180,21 @@ msgstr "" "Táto výplatná páska má účtovný zápis. Pred návratom do návrhu alebo " "prepočtom použite postup zrušenia alebo opravy mzdy." +#. module: payroll_account +#: model:ir.model,name:payroll_account.model_payroll_account_child_guard +msgid "Accounted Payroll Child Guard" +msgstr "Ochrana podkladov zaúčtovanej mzdy" + +#. module: payroll_account +#: model:ir.model,name:payroll_account.model_hr_payslip_input +msgid "Payslip Input" +msgstr "" + +#. module: payroll_account +#: model:ir.model,name:payroll_account.model_hr_payslip_worked_days +msgid "Payslip Worked Days" +msgstr "" + #~ msgid "Company" #~ msgstr "" diff --git a/payroll_account/models/__init__.py b/payroll_account/models/__init__.py index 298cc38fb..07f0c36fc 100644 --- a/payroll_account/models/__init__.py +++ b/payroll_account/models/__init__.py @@ -1,6 +1,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import hr_contract +from . import payroll_child_guard from . import hr_payslip_line from . import hr_payslip_run from . import hr_payslip diff --git a/payroll_account/models/hr_payslip.py b/payroll_account/models/hr_payslip.py index 8f48b8451..7a60424a2 100644 --- a/payroll_account/models/hr_payslip.py +++ b/payroll_account/models/hr_payslip.py @@ -61,9 +61,18 @@ def action_payslip_cancel(self): payslip.move_id.with_context(force_delete=True).unlink() else: payslip.move_id._reverse_moves() - payslip.move_id = False + # Internal transition after the explicit reversal. Public + # writes cannot detach an entry to bypass history guards. + super(HrPayslip, payslip).write({'move_id': False}) return super().action_payslip_cancel() + def write(self, values): + if {'company_id', 'employee_id', 'contract_id', 'struct_id', 'date_from', + 'date_to', 'credit_note', 'journal_id', 'date', 'state', 'move_id', + 'line_ids', 'worked_days_line_ids', 'input_line_ids'}.intersection(values): + self._check_no_accounting_entry() + return super().write(values) + def _check_no_accounting_entry(self): """Reset/recalculation does not reverse an existing journal entry.""" self.check_access("write") diff --git a/payroll_account/models/hr_payslip_line.py b/payroll_account/models/hr_payslip_line.py index 0560c66f3..98339d81a 100644 --- a/payroll_account/models/hr_payslip_line.py +++ b/payroll_account/models/hr_payslip_line.py @@ -5,7 +5,11 @@ class HrPayslipLine(models.Model): - _inherit = "hr.payslip.line" + _name = 'hr.payslip.line' + _inherit = ['hr.payslip.line', 'payroll.account.child.guard'] + _accounting_parent_field = 'slip_id' + _accounting_protected_fields = frozenset(('slip_id', 'employee_id', 'contract_id', + 'salary_rule_id', 'category_id', 'code', 'amount', 'quantity', 'rate', 'total', 'company_id')) def _get_partner_id(self, credit_account): """ diff --git a/payroll_account/models/payroll_child_guard.py b/payroll_account/models/payroll_child_guard.py new file mode 100644 index 000000000..012b06df7 --- /dev/null +++ b/payroll_account/models/payroll_child_guard.py @@ -0,0 +1,45 @@ +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0.html). +from odoo import api, models + + +class PayrollAccountChildGuard(models.AbstractModel): + _name = 'payroll.account.child.guard' + _description = 'Accounted Payroll Child Guard' + + _accounting_parent_field = None + _accounting_protected_fields = frozenset() + + @api.model_create_multi + def create(self, values_list): + self.check_access('create') + field = self._accounting_parent_field + parents = [values.get(field, self.env.context.get('default_'+field)) for values in values_list] + self.env['hr.payslip'].browse([value for value in parents if value])._check_no_accounting_entry() + return super().create(values_list) + + def write(self, values): + self.check_access('write') + if self._accounting_protected_fields.intersection(values): + parents = self.mapped(self._accounting_parent_field) + parents |= self.env['hr.payslip'].browse(values.get(self._accounting_parent_field)) + parents._check_no_accounting_entry() + return super().write(values) + + def unlink(self): + self.check_access('unlink') + self.mapped(self._accounting_parent_field)._check_no_accounting_entry() + return super().unlink() + + +class PayrollInput(models.Model): + _name = 'hr.payslip.input' + _inherit = ['hr.payslip.input', 'payroll.account.child.guard'] + _accounting_parent_field = 'payslip_id' + _accounting_protected_fields = frozenset(('payslip_id', 'contract_id', 'code', 'amount')) + + +class PayrollWorkedDays(models.Model): + _name = 'hr.payslip.worked_days' + _inherit = ['hr.payslip.worked_days', 'payroll.account.child.guard'] + _accounting_parent_field = 'payslip_id' + _accounting_protected_fields = frozenset(('payslip_id', 'contract_id', 'code', 'number_of_days', 'number_of_hours')) diff --git a/payroll_account/readme/DESCRIPTION.md b/payroll_account/readme/DESCRIPTION.md index f39a851c4..09d713f29 100644 --- a/payroll_account/readme/DESCRIPTION.md +++ b/payroll_account/readme/DESCRIPTION.md @@ -8,3 +8,9 @@ An existing accounting entry prevents a direct reset or recalculation of the payslip. Use the payroll cancellation or correction workflow first so salary lines cannot silently diverge from the journal entry. Payslips without an accounting entry can still be reset and calculated normally. + +Accounted salary lines, worked time and inputs cannot be added, removed, +reassigned or financially changed independently of their journal entry. +Payroll identity, state and the accounting link follow the same check. +Descriptions remain editable, and draft calculation, cancellation and the +native refund workflow remain available. diff --git a/payroll_account/tests/test_payroll_account.py b/payroll_account/tests/test_payroll_account.py index 4d6c22d15..0f6038a51 100644 --- a/payroll_account/tests/test_payroll_account.py +++ b/payroll_account/tests/test_payroll_account.py @@ -6,7 +6,7 @@ from odoo import fields from odoo.exceptions import UserError -from odoo.tests import Form, common +from odoo.tests import Form, common, new_test_user class TestPayrollAccount(common.TransactionCase): @@ -34,6 +34,91 @@ def test_recompute_preserves_posted_salary_and_journal_entry(self): self.assertEqual(payslip.move_id, move) self.assertEqual(move.line_ids.ids, move_lines) + def test_direct_salary_line_edits_preserve_accounted_payroll(self): + payslip = self._posted_lifecycle_slip() + line = payslip.line_ids[:1] + before = line.amount + with self.assertRaises(UserError): + line.amount = before + 100 + with self.assertRaises(UserError): + line.unlink() + with self.assertRaises(UserError): + line.copy({'slip_id': payslip.id}) + self.assertEqual(line.amount, before) + line.name = 'Retained amount, corrected description' + + def test_direct_worked_time_edits_preserve_accounted_payroll(self): + payslip = self._posted_lifecycle_slip() + with self.assertRaises(UserError): + self.env['hr.payslip.worked_days'].with_context(default_payslip_id=payslip.id).create({ + 'name': 'Unreviewed extra time', 'code': 'EXTRA', + 'contract_id': payslip.contract_id.id, 'number_of_days': 1, 'number_of_hours': 8}) + + def test_direct_input_edits_preserve_accounted_payroll(self): + payslip = self._posted_lifecycle_slip() + with self.assertRaises(UserError): + self.env['hr.payslip.input'].with_context(default_payslip_id=payslip.id).create({ + 'name': 'Unreviewed input', 'code': 'EXTRA', + 'contract_id': payslip.contract_id.id, 'amount': 100}) + + def test_accounted_parent_cannot_detach_entry_or_change_payroll_identity(self): + payslip = self._posted_lifecycle_slip() + for values in ({'move_id': False}, {'state': 'draft'}, {'credit_note': True}): + with self.assertRaises(UserError): + payslip.write(values) + + def test_accounted_child_cannot_be_moved_into_a_draft(self): + posted = self._posted_lifecycle_slip() + draft = self._prepare_payslip(self.hr_employee_john) + with self.assertRaises(UserError): + posted.line_ids[:1].write({'slip_id': draft.id}) + + def test_native_refund_sheet_keeps_original_and_posts_new_entry(self): + payslip = self._posted_lifecycle_slip() + original = payslip.move_id + result = payslip.refund_sheet() + self.assertTrue(result) + self.assertEqual(payslip.move_id, original) + self.assertNotEqual(payslip.refunded_id.move_id, original) + self.assertEqual(payslip.refunded_id.move_id.state, 'posted') + + def test_accounted_input_batch_is_rejected_before_draft_mutation(self): + self._update_account_in_rule(self.account_debit, self.account_credit) + posted = self._prepare_payslip(self.hr_employee_john) + posted.journal_id = self.account_journal + original = self.env['hr.payslip.input'].create({'name': 'Retained input', + 'code': 'EXTRA', 'contract_id': posted.contract_id.id, 'payslip_id': posted.id, 'amount': 1}) + time = self.env['hr.payslip.worked_days'].create({'name': 'Retained hours', + 'code': 'WORK100', 'contract_id': posted.contract_id.id, 'payslip_id': posted.id, + 'number_of_days': 1, 'number_of_hours': 8}) + posted.compute_sheet() + posted.action_payslip_done() + draft = self._prepare_payslip(self.hr_employee_john) + editable = original.copy({'payslip_id': draft.id}) + editable.amount = 2 + for record, values in ((original | editable, {'amount': 99}), (time, {'number_of_hours': 99})): + with self.assertRaises(UserError): + record.write(values) + self.assertEqual(editable.amount, 2) + for record in (original, time): + with self.assertRaises(UserError): + record.unlink() + editable.unlink() + + def test_payroll_user_can_edit_a_draft_but_not_accounted_salary(self): + posted = self._posted_lifecycle_slip() + draft = posted.copy() + user = new_test_user(self.env, login='payroll-child-guard-user', + groups='base.group_user,hr.group_hr_user,payroll.group_payroll_user,account.group_account_user', + company_id=self.env.company.id, company_ids=[(6, 0, self.env.company.ids)]) + manager = self.env['hr.employee'].create({'name': 'Payroll department officer', 'user_id': user.id}) + self.hr_employee_john.department_id.manager_id = manager + editable = draft.line_ids[:1].with_user(user) + editable.amount = 123 + self.assertEqual(editable.amount, 123) + with self.assertRaises(UserError): + posted.line_ids[:1].with_user(user).amount = 123 + def test_reset_preserves_posted_salary_state_and_entry(self): payslip = self._posted_lifecycle_slip() with self.assertRaises(UserError):