mirror of
https://github.com/bringout/oca-ocb-hr.git
synced 2026-04-24 23:32:00 +02:00
Fix hr_payroll_clone: AttributeError, add journal/work_type support, use standard wizard
- Fix AttributeError: hr.payslip.run has no company_id field - Change batch name format from MM/YYYY to YYYY-MM (remove 'Payslips' prefix) - Add journal_id field and copy from previous batch - Add work_type_id support (Redovni rad/Regular work) in timesheet generation - Add duplicate check for existing timesheets to prevent duplication - Use standard Odoo hr.payslip.employees wizard for payslip generation - Update version to 16.0.1.1.0 🤖 assisted by claude 🤖 assisted by claude
This commit is contained in:
parent
77a8838cf7
commit
dc4d96d97a
23 changed files with 4281 additions and 2575 deletions
|
|
@ -15,16 +15,17 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#. odoo-python
|
||||
#: code:addons/hr_work_entry_holidays/models/hr_leave.py:0
|
||||
#: code:addons/hr_work_entry_holidays/models/hr_leave.py
|
||||
#, python-format
|
||||
msgid "%s: Time Off"
|
||||
msgstr "%s: slobodan"
|
||||
|
||||
#. module: hr_work_entry_holidays
|
||||
#. odoo-python
|
||||
#: code:addons/hr_work_entry_holidays/models/hr_leave.py:0
|
||||
#: code:addons/hr_work_entry_holidays/models/hr_leave.py
|
||||
#, python-format
|
||||
msgid ""
|
||||
"A leave cannot be set across multiple contracts with different working schedules.\n"
|
||||
|
|
@ -37,7 +38,14 @@ msgid ""
|
|||
"Contracts:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Odsustvo se ne može postaviti preko više ugovora sa različitim radnim rasporedima.\n"
|
||||
"Molimo kreirajte jedno odsustvo za svaki ugovor.\n"
|
||||
"Odsustvo:\n"
|
||||
"%s\n"
|
||||
"Ugovori:\n"
|
||||
"%s"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#: model:ir.model,name:hr_work_entry_holidays.model_hr_contract
|
||||
msgid "Employee Contract"
|
||||
|
|
@ -53,6 +61,7 @@ msgstr "HR Unos Rada"
|
|||
msgid "HR Work Entry Type"
|
||||
msgstr "HR Tip Unosa Rada"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#: model_terms:ir.ui.view,arch_db:hr_work_entry_holidays.work_entry_type_leave_form_inherit
|
||||
msgid "Payroll"
|
||||
|
|
@ -63,6 +72,7 @@ msgstr "Obračun plaće"
|
|||
msgid "Status"
|
||||
msgstr "Status"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#: model:ir.model.fields,help:hr_work_entry_holidays.field_hr_work_entry__leave_state
|
||||
msgid ""
|
||||
|
|
@ -71,33 +81,41 @@ msgid ""
|
|||
"The status is 'Refused', when time off request is refused by manager.\n"
|
||||
"The status is 'Approved', when time off request is approved by manager."
|
||||
msgstr ""
|
||||
"Status je 'Za slanje' kada je zahtjev kreiran.\n"
|
||||
"Status je 'Za odobriti' kada je zahtjev potvrđen od strane zaposlenika.\n"
|
||||
"Status je 'Odbijen' kada je zahtjev odbijen od strane menadžera.\n"
|
||||
"Status je 'Odobren' kada je zahtjev odobren od strane menadžera."
|
||||
|
||||
#. module: hr_work_entry_holidays
|
||||
#. odoo-python
|
||||
#: code:addons/hr_work_entry_holidays/models/hr_leave.py:0
|
||||
#: code:addons/hr_work_entry_holidays/models/hr_leave.py
|
||||
#, python-format
|
||||
msgid ""
|
||||
"There is no employee set on the time off. Please make sure you're logged in "
|
||||
"the correct company."
|
||||
msgstr ""
|
||||
"Nema postavljenog zaposlenog na odsustvu. Molimo uvjerite se da ste "
|
||||
"prijavljeni u ispravnoj kompaniji."
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#: model:ir.model,name:hr_work_entry_holidays.model_hr_leave
|
||||
#: model:ir.model.fields,field_description:hr_work_entry_holidays.field_hr_work_entry__leave_id
|
||||
msgid "Time Off"
|
||||
msgstr "Odsustva"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#: model:ir.model,name:hr_work_entry_holidays.model_hr_leave_type
|
||||
#: model:ir.model.fields,field_description:hr_work_entry_holidays.field_hr_work_entry_type__leave_type_ids
|
||||
msgid "Time Off Type"
|
||||
msgstr "Vrsta odsustva"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#: model:ir.model.fields,field_description:hr_work_entry_holidays.field_hr_leave_type__work_entry_type_id
|
||||
msgid "Work Entry Type"
|
||||
msgstr "Vrsta radnih sati"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_work_entry_holidays
|
||||
#: model:ir.model.fields,help:hr_work_entry_holidays.field_hr_work_entry_type__leave_type_ids
|
||||
msgid "Work entry used in the payslip."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue