Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion payroll_account/__manifest__.py
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
61 changes: 57 additions & 4 deletions payroll_account/i18n/payroll_account.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,22 @@
#
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 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"
"Content-Type: text/plain; charset=UTF-8\n"
"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
Expand All @@ -31,9 +38,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 ""

Expand Down Expand Up @@ -61,7 +69,20 @@ 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_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,name:payroll_account.model_hr_version
msgid "Employee Contract"
msgstr ""

Expand All @@ -70,6 +91,19 @@ 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_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 ""

#. 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."
Expand All @@ -85,21 +119,32 @@ 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
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 ""

Expand Down Expand Up @@ -131,3 +176,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 ""
81 changes: 62 additions & 19 deletions payroll_account/i18n/sk.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand All @@ -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
Expand All @@ -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"

Expand Down Expand Up @@ -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"

Expand All @@ -142,18 +135,68 @@ 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_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 ""

#. 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."

#. 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 ""

#~ msgid "Pay Slip"
#~ msgstr "Pay Slip "
1 change: 1 addition & 0 deletions payroll_account/models/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
40 changes: 39 additions & 1 deletion payroll_account/models/hr_payslip.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,48 @@ 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")
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:
Expand Down
6 changes: 5 additions & 1 deletion payroll_account/models/hr_payslip_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
45 changes: 45 additions & 0 deletions payroll_account/models/payroll_child_guard.py
Original file line number Diff line number Diff line change
@@ -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'))
1 change: 1 addition & 0 deletions payroll_account/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- Odoo SA \<<info@odoo.com>\>
- Saran Lim. \<<saranl@ecosoft.co.th>\>
- Daniel Reis \<<dreis@opensourceintegrators.com>\>
- votrelec <https://github.com/votrelec>
Loading