mirror of
https://github.com/bringout/oca-hr.git
synced 2026-04-25 07:12:06 +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
3ac97a2210
commit
ee00be80d0
46 changed files with 459 additions and 441 deletions
|
|
@ -29,13 +29,21 @@ msgid ""
|
|||
" optional fields and only need to click on the button\n"
|
||||
" \"Create\"."
|
||||
msgstr ""
|
||||
"Po defaultu, najnoviji javni praznici\n"
|
||||
" za svaku zemlju se koriste kao template za kreiranje\n"
|
||||
" javnih praznika za godinu koja slijedi template.\n"
|
||||
" <br/><br/>\n"
|
||||
" Normalno, ne trebate unijeti ništa u\n"
|
||||
" opciona polja i trebate samo kliknuti na dugme\n"
|
||||
" \"Kreiraj\"."
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__year
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__year_id
|
||||
msgid "Calendar Year"
|
||||
msgstr "Kalendarska godina"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.holidays_public_next_year_wizard_view
|
||||
msgid "Cancel"
|
||||
|
|
@ -46,77 +54,86 @@ msgstr "Odustani"
|
|||
msgid "Contact"
|
||||
msgstr "Kontakt"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__country_id
|
||||
msgid "Country"
|
||||
msgstr "Država"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.holidays_public_next_year_wizard_view
|
||||
msgid "Create"
|
||||
msgstr "Kreiraj"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.actions.act_window,name:hr_holidays_public.action_create_next_year_public_holidays
|
||||
#: model:ir.ui.menu,name:hr_holidays_public.menu_create_next_year_public_holidays
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.holidays_public_next_year_wizard_view
|
||||
msgid "Create Next Year Public Holidays"
|
||||
msgstr "Kreiraj državne praznike za sljedeću godinu"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__create_uid
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__create_uid
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard__create_uid
|
||||
msgid "Created by"
|
||||
msgstr "Kreirao"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__create_date
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__create_date
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard__create_date
|
||||
msgid "Created on"
|
||||
msgstr "Kreirano"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model,name:hr_holidays_public.model_public_holidays_next_year_wizard
|
||||
msgid "Creates public holidays from existing ones"
|
||||
msgstr "Kreiraj državne praznike iz postojećih"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__date
|
||||
msgid "Date"
|
||||
msgstr "Datum"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__variable_date
|
||||
msgid "Date may change"
|
||||
msgstr "Datum može varirati"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#. odoo-python
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py:0
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dates of holidays should be the same year as the calendar year they are "
|
||||
"being assigned to"
|
||||
msgstr ""
|
||||
"Datumi praznika bi trebali biti u istoj godini za koju je kreiran ovaj "
|
||||
"kalendar"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.holidays_public_next_year_wizard_view
|
||||
msgid "Defaults"
|
||||
msgstr "Zadane vrijednosti"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__display_name
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard__display_name
|
||||
msgid "Display Name"
|
||||
msgstr "Naziv"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_leave_type__exclude_public_holidays
|
||||
#, fuzzy
|
||||
msgid "Exclude Public Holidays"
|
||||
msgstr "Državni praznici"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__line_ids
|
||||
msgid "Holiday Dates"
|
||||
|
|
@ -124,34 +141,30 @@ msgstr "Datumi praznika"
|
|||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__id
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__id
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard__id
|
||||
msgid "ID"
|
||||
msgstr "ID"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,help:hr_holidays_public.field_hr_leave_type__exclude_public_holidays
|
||||
msgid "If enabled, public holidays are skipped in leave days calculation."
|
||||
msgstr "Ako je omogućeno, javni praznici se preskačeu u kalkulaciji dana odmora."
|
||||
msgstr ""
|
||||
"Ako je omogućeno, javni praznici se preskačeu u kalkulaciji dana odmora."
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public____last_update
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line____last_update
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard____last_update
|
||||
msgid "Last Modified on"
|
||||
msgstr "Zadnje modificirano"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__write_uid
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__write_uid
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard__write_uid
|
||||
msgid "Last Updated by"
|
||||
msgstr "Zadnji ažurirao"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__write_date
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__write_date
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard__write_date
|
||||
msgid "Last Updated on"
|
||||
msgstr "Zadnje ažurirano"
|
||||
|
||||
|
|
@ -160,21 +173,25 @@ msgstr "Zadnje ažurirano"
|
|||
msgid "Meeting"
|
||||
msgstr "Sastanak"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public__display_name
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__name
|
||||
msgid "Name"
|
||||
msgstr "Naziv"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#. odoo-python
|
||||
#: code:addons/hr_holidays_public/wizards/holidays_public_next_year_wizard.py:0
|
||||
#: code:addons/hr_holidays_public/wizards/holidays_public_next_year_wizard.py
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No Public Holidays found as template. Please create the first Public "
|
||||
"Holidays manually."
|
||||
msgstr ""
|
||||
"Nisu pronađeni predlošci državnih praznika. Molimo kreirajte prvi državni "
|
||||
"praznik ručno."
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.holidays_public_next_year_wizard_view
|
||||
msgid "Optional"
|
||||
|
|
@ -182,26 +199,22 @@ msgstr "Opcionalno"
|
|||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_employee__is_public_holiday
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_employee_base__is_public_holiday
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_employee_public__is_public_holiday
|
||||
msgid "Public Holiday Today"
|
||||
msgstr "Javni praznik danas"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.actions.act_window,name:hr_holidays_public.open_holidays_public_view
|
||||
#: model:ir.model,name:hr_holidays_public.model_hr_holidays_public
|
||||
#: model:ir.ui.menu,name:hr_holidays_public.menu_holidays_public_view
|
||||
#: model:ir.ui.menu,name:hr_holidays_public.menu_hr_public_holidays
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.edit_holiday_status_form
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.view_holidays_public_form
|
||||
msgid "Public Holidays"
|
||||
msgstr "Državni praznici"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model,name:hr_holidays_public.model_hr_holidays_public_line
|
||||
msgid "Public Holidays Lines"
|
||||
msgstr "Stavke državnih praznika"
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_public_line__state_ids
|
||||
msgid "Related States"
|
||||
|
|
@ -220,7 +233,13 @@ msgid ""
|
|||
"country for each year will be taken into account (If you select templates "
|
||||
"from 2012 and 2015, only the templates from 2015 will be taken into account."
|
||||
msgstr ""
|
||||
"Odaberite javne praznike za korištenje kao template. Ako nije postavljen, "
|
||||
"najnoviji javni praznici svake zemlje će biti korišćeni. Samo zadnji "
|
||||
"templateovi svake zemlje za svaku godinu će biti uzeti u obzir (ako "
|
||||
"odaberete templateove iz 2012. i 2015., samo templateovi iz 2015. će biti "
|
||||
"uzeti u obzir."
|
||||
|
||||
# taken from hr.po
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_public_holidays_next_year_wizard__template_ids
|
||||
msgid "Templates"
|
||||
|
|
@ -235,6 +254,11 @@ msgid ""
|
|||
" anniversary of the Italian unification, so you want to\n"
|
||||
" replicate the 2010 Italian holidays to 2012.\""
|
||||
msgstr ""
|
||||
"Donja opciona polja su ovdje samo za rukovanje\n"
|
||||
" posebnim situacijama kao \"2011 je bila posebna godina sa\n"
|
||||
" dodatnim javnim praznikom za 150.\n"
|
||||
" godišnjicu italijanskog ujedinjenja, pa želite\n"
|
||||
" replicirati italijanske praznike iz 2010. na 2012.\""
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model,name:hr_holidays_public.model_hr_leave
|
||||
|
|
@ -257,6 +281,13 @@ msgid ""
|
|||
" only the templates from 2015 will be taken into\n"
|
||||
" account)."
|
||||
msgstr ""
|
||||
"Koristite ovaj čarobnjak da kreirate javne praznike bazirane na\n"
|
||||
" postojećima.<br/>\n"
|
||||
" Samo zadnji templateovi svake zemlje\n"
|
||||
" će biti uzeti u obzir (ako odaberete templateove\n"
|
||||
" iz 2012. i 2015. iste zemlje;\n"
|
||||
" samo templateovi iz 2015. će biti uzeti u\n"
|
||||
" obzir)."
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model,name:hr_holidays_public.model_res_users
|
||||
|
|
@ -274,36 +305,43 @@ msgid ""
|
|||
"Year for which you want to create the public holidays. By default, the year "
|
||||
"following the template."
|
||||
msgstr ""
|
||||
"Godina za koju želite kreirati javne praznike. Po defaultu, godina koja "
|
||||
"slijedi template."
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#. odoo-python
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py:0
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You can't create duplicate public holiday per date %s and one of the country"
|
||||
" states."
|
||||
msgstr ""
|
||||
"Ne možete kreirati duplikat javnog praznika po datumu %s i jednoj od država "
|
||||
"zemlje."
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#. odoo-python
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py:0
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py
|
||||
#, python-format
|
||||
msgid "You can't create duplicate public holiday per date %s."
|
||||
msgstr "Ne možete kreirati duplikat javnog praznika po datumu %s."
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#. odoo-python
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py:0
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays_public.py
|
||||
#, python-format
|
||||
msgid "You can't create duplicate public holiday per year and/or country"
|
||||
msgstr "Ne možete kreirati duplikat javnog praznika po godini i/ili zemlji"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#. odoo-python
|
||||
#: code:addons/hr_holidays_public/wizards/holidays_public_next_year_wizard.py:0
|
||||
#: code:addons/hr_holidays_public/wizards/holidays_public_next_year_wizard.py
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot use as template the public holidays of a year that includes "
|
||||
"public holidays on 29th of February (2016, 2020...), please select a "
|
||||
"template from another year."
|
||||
msgstr ""
|
||||
"Ne možete koristiti kao template javne praznike godine koja uključuje javne "
|
||||
"praznike 29. februara (2016, 2020...), molimo odaberite template iz druge "
|
||||
"godine."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue