mirror of
https://github.com/bringout/oca-hr.git
synced 2026-04-23 01:52:02 +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
|
|
@ -41,6 +41,29 @@ msgid ""
|
|||
" </div>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<div style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
|
||||
" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
|
||||
" Dragi ${object.partner_id.name or 'sudioniče'}<br><br>\n"
|
||||
" % if object.survey_id.certificate:\n"
|
||||
" Pozvani ste da provedete novu certifikaciju.\n"
|
||||
" % else:\n"
|
||||
" Provodimo anketu i cijenila bi se vaša povratna informacija.\n"
|
||||
" % endif\n"
|
||||
" <div style=\"margin: 16px 0px 16px 0px;\">\n"
|
||||
" <a href=\"%24%7B('%s?answer_token=%s'%20%20(object.survey_id.public_url,%20object.access_token))%20%7C%20safe%7D\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
|
||||
" % if object.survey_id.certificate:\n"
|
||||
" Počni certifikaciju\n"
|
||||
" % else:\n"
|
||||
" Počni anketu\n"
|
||||
" % endif\n"
|
||||
" </a>\n"
|
||||
" </div>\n"
|
||||
" % if object.deadline:\n"
|
||||
" Molimo odgovorite na anketu za ${format_date(object.deadline)}.<br><br>\n"
|
||||
" % endif\n"
|
||||
" Hvala vam na sudjelovanju.\n"
|
||||
" </p>\n"
|
||||
" </div>\n"
|
||||
|
||||
#. module: hr_course_survey
|
||||
#: model:ir.model,name:hr_course_survey.model_hr_course
|
||||
|
|
@ -59,7 +82,6 @@ msgstr "Raspored tečaja"
|
|||
|
||||
#. module: hr_course_survey
|
||||
#: model:ir.model.fields,field_description:hr_course_survey.field_hr_course__examination_survey_id
|
||||
#: model:ir.model.fields,field_description:hr_course_survey.field_hr_course_schedule__examination_survey_id
|
||||
msgid "Examination Survey"
|
||||
msgstr "Ispitna anketa"
|
||||
|
||||
|
|
@ -90,15 +112,15 @@ msgstr "Anketa koju popunjava korisnik"
|
|||
|
||||
#. module: hr_course_survey
|
||||
#. odoo-python
|
||||
#: code:addons/hr_course_survey/models/hr_course_attendee.py:0
|
||||
#: code:addons/hr_course_survey/models/hr_course_attendee.py
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Survey cannot be sent because the previous survey has not been answered"
|
||||
msgstr ""
|
||||
msgstr "Anketa se ne može poslati jer prethodna anketa nije odgovorena"
|
||||
|
||||
#. module: hr_course_survey
|
||||
#. odoo-python
|
||||
#: code:addons/hr_course_survey/models/hr_course_attendee.py:0
|
||||
#: code:addons/hr_course_survey/models/hr_course_attendee.py
|
||||
#, python-format
|
||||
msgid "Survey cannot be sent if the user has not failed"
|
||||
msgstr "Anketa se ne može poslati ako korisnik nije pao"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue