diff --git a/.gitignore b/.gitignore index 890ff010945f..801154d62f25 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ var/ *.egg-info/ .installed.cfg *.egg +.eggs # Installer logs pip-log.txt diff --git a/README.md b/README.md index 1e25d3fdbbf4..f8666b1b61b2 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,18 @@ addon | version | summary [hr_contract_default_trial_length](hr_contract_default_trial_length/) | 10.0.1.0.0 | Define default trail length for contracts [hr_contract_reference](hr_contract_reference/) | 10.0.1.0.0 | HR Contract Reference [hr_emergency_contact](hr_emergency_contact/) | 10.0.1.0.0 | HR Emergency Contact +[hr_employee_address_improved](hr_employee_address_improved/) | 10.0.1.0.0 | HR Employee Address Improved [hr_employee_age](hr_employee_age/) | 10.0.1.0.0 | Age field for employee [hr_employee_birth_name](hr_employee_birth_name/) | 10.0.1.0.0 | Employee Birth Name +[hr_employee_category_parent](hr_employee_category_parent/) | 10.0.1.0.0 | Categorize your employee categories [hr_employee_firstname](hr_employee_firstname/) | 10.0.1.0.0 | Adds First Name to Employee -[hr_employee_id](hr_employee_id/) | 10.0.1.0.0 | Employee ID +[hr_employee_id](hr_employee_id/) | 10.0.1.1.0 | Employee ID +[hr_employee_legacy_id](hr_employee_legacy_id/) | 10.0.1.0.0 | Legacy Employee ID [hr_employee_phone_extension](hr_employee_phone_extension/) | 10.0.1.0.0 | Employee Phone Extension -[hr_employee_seniority](hr_employee_seniority/) | 10.0.1.0.0 | Keep Track of Length of Employment +[hr_employee_seniority](hr_employee_seniority/) | 10.0.1.0.2 | Keep Track of Length of Employment [hr_employee_social_media](hr_employee_social_media/) | 10.0.1.0.0 | Employee Social Media +[hr_expense_analytic_distribution](hr_expense_analytic_distribution/) | 10.0.1.0.0 | Use analytic plans in expenses +[hr_expense_invoice](hr_expense_invoice/) | 10.0.1.0.0 | Supplier invoices on HR expenses [hr_expense_sequence](hr_expense_sequence/) | 10.0.1.0.0 | HR expense sequence [hr_experience](hr_experience/) | 10.0.1.0.0 | Experience Management [hr_family](hr_family/) | 10.0.1.0.0 | Employee Family Information @@ -31,7 +36,12 @@ addon | version | summary [hr_holidays_imposed_days](hr_holidays_imposed_days/) | 10.0.1.0.0 | Imposed holidays days [hr_holidays_leave_auto_approve](hr_holidays_leave_auto_approve/) | 10.0.1.0.0 | Leave type for auto approval of Leaves [hr_holidays_legal_leave](hr_holidays_legal_leave/) | 10.0.1.0.0 | Allows the definition of legal/annual leave +[hr_holidays_meeting_name](hr_holidays_meeting_name/) | 10.0.1.0.0 | Personnalize meeting name generated by leaves +[hr_holidays_notify_employee_manager](hr_holidays_notify_employee_manager/) | 10.0.1.0.0 | Notify employee's manager by mail on Leave Requests creation. +[hr_holidays_settings](hr_holidays_settings/) | 10.0.1.1.0 | Enables Settings Form for HR Holidays. [hr_public_holidays](hr_public_holidays/) | 10.0.1.0.0 | Manage Public Holidays +[hr_skill](hr_skill/) | 10.0.1.0.0 | Skill Management +[hr_worked_days_from_timesheet](hr_worked_days_from_timesheet/) | 10.0.1.0.0 | Adds a button to import worked days from timesheet. Unported addons @@ -46,12 +56,9 @@ addon | version | summary [hr_employee_benefit](hr_employee_benefit/) | 8.0.1.0.0 (unported) | Employee Benefit [hr_employee_data_from_work_address](hr_employee_data_from_work_address/) | 8.0.1.0.0 (unported) | Update user's and partner's data fields from employee record [hr_employee_gravatar](hr_employee_gravatar/) | 8.0.1.0.0 (unported) | Employees Synchronize Gravatar image -[hr_employee_legacy_id](hr_employee_legacy_id/) | 8.0.1.0.0 (unported) | Legacy Employee ID [hr_employee_reference](hr_employee_reference/) | 8.0.1.0.0 (unported) | Manage employee references [hr_expense_account_period](hr_expense_account_period/) | 8.0.0.1.0 (unported) | Accounting period for HR expenses journal entries [hr_expense_analytic_default](hr_expense_analytic_default/) | 8.0.0.1.0 (unported) | Manage default analytic account on expenses -[hr_expense_analytic_plans](hr_expense_analytic_plans/) | 8.0.1.0.0 (unported) | Use analytic plans in expenses -[hr_expense_invoice](hr_expense_invoice/) | 8.0.1.0.0 (unported) | Supplier invoices on HR expenses [hr_expense_move_date](hr_expense_move_date/) | 8.0.1.0.0 (unported) | Move date for HR expenses journal entries [hr_infraction](hr_infraction/) | 1.0 (unported) | Employee Infraction Management [hr_job_categories](hr_job_categories/) | 8.0.1.0.0 (unported) | HR Job Employee Categories @@ -73,12 +80,10 @@ addon | version | summary [hr_salary_rule_variable](hr_salary_rule_variable/) | 1.0 (unported) | Salary Rule Variables [hr_schedule](hr_schedule/) | 1.0 (unported) | Employee Shift Scheduling [hr_security](hr_security/) | 8.0.1.0.0 (unported) | HR Permission Groups -[hr_skill](hr_skill/) | 8.0.1.1.0 (unported) | Skill Management [hr_transfer](hr_transfer/) | 1.0 (unported) | Departmental Transfer [hr_wage_increment](hr_wage_increment/) | 1.0 (unported) | HR Wage Increment [hr_webcam](hr_webcam/) | 8.0.1.0.0 (unported) | Capture employee picture with webcam [hr_worked_days_activity](hr_worked_days_activity/) | 1.0 (unported) | Worked Days Activity -[hr_worked_days_from_timesheet](hr_worked_days_from_timesheet/) | 8.0.1.0.0 (unported) | Worked Days From Timesheet [hr_worked_days_hourly_rate](hr_worked_days_hourly_rate/) | 1.0 (unported) | Worked Days Hourly Rates [//]: # (end addons) diff --git a/hr_contract_default_trial_length/i18n/ar.po b/hr_contract_default_trial_length/i18n/ar.po index a1617723d639..9b007709c576 100644 --- a/hr_contract_default_trial_length/i18n/ar.po +++ b/hr_contract_default_trial_length/i18n/ar.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-10 04:30+0000\n" -"PO-Revision-Date: 2017-06-10 04:30+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: abdullah alsabi , 2017\n" "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,6 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#. module: hr_contract_default_trial_length -#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract -msgid "Contract" -msgstr "العقد" - #. module: hr_contract_default_trial_length #: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type msgid "Contract Type" @@ -33,6 +28,11 @@ msgstr "نوع العقد" msgid "Default contract trial length in Days" msgstr "مدة فترة التجربة بالأيام" +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + #. module: hr_contract_default_trial_length #: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Trial length" diff --git a/hr_contract_default_trial_length/i18n/de.po b/hr_contract_default_trial_length/i18n/de.po index ecc0d63fef05..462eef1beccc 100644 --- a/hr_contract_default_trial_length/i18n/de.po +++ b/hr_contract_default_trial_length/i18n/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:36+0000\n" -"PO-Revision-Date: 2017-03-03 03:36+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,6 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. module: hr_contract_default_trial_length -#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract -msgid "Contract" -msgstr "Vertrag" - #. module: hr_contract_default_trial_length #: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type msgid "Contract Type" @@ -33,6 +28,11 @@ msgstr "Vertragsart" msgid "Default contract trial length in Days" msgstr "Probezeit in Tagen per Vorgabe" +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + #. module: hr_contract_default_trial_length #: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Trial length" diff --git a/hr_contract_default_trial_length/i18n/es.po b/hr_contract_default_trial_length/i18n/es.po index 06f9296ad958..bd127b5f72fc 100644 --- a/hr_contract_default_trial_length/i18n/es.po +++ b/hr_contract_default_trial_length/i18n/es.po @@ -3,37 +3,37 @@ # * hr_contract_default_trial_length # # Translators: -# Antonio Trueba, 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-02-05 12:48+0000\n" -"Last-Translator: Antonio Trueba\n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-hr-8-0/language/es/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. module: hr_contract_default_trial_length -#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract -msgid "Contract" -msgstr "Contrato" - #. module: hr_contract_default_trial_length #: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type msgid "Contract Type" msgstr "Tipo de contrato" #. module: hr_contract_default_trial_length -#: help:hr.contract.type,trial_length:0 +#: model:ir.model.fields,help:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Default contract trial length in Days" msgstr "" #. module: hr_contract_default_trial_length -#: field:hr.contract.type,trial_length:0 +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + +#. module: hr_contract_default_trial_length +#: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Trial length" msgstr "" diff --git a/hr_contract_default_trial_length/i18n/fr.po b/hr_contract_default_trial_length/i18n/fr.po index d7b9831a4c00..cc4e45a8e5fc 100644 --- a/hr_contract_default_trial_length/i18n/fr.po +++ b/hr_contract_default_trial_length/i18n/fr.po @@ -3,37 +3,38 @@ # * hr_contract_default_trial_length # # Translators: -# Mohamed HABOU , 2016 +# guillaume bauer , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-01-11 17:19+0000\n" -"Last-Translator: Mohamed HABOU \n" -"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. module: hr_contract_default_trial_length -#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract -msgid "Contract" -msgstr "Contrat" - #. module: hr_contract_default_trial_length #: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type msgid "Contract Type" msgstr "Type du contrat" #. module: hr_contract_default_trial_length -#: help:hr.contract.type,trial_length:0 +#: model:ir.model.fields,help:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Default contract trial length in Days" +msgstr "Durée de la période d’essai par défaut en jours" + +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" msgstr "" #. module: hr_contract_default_trial_length -#: field:hr.contract.type,trial_length:0 +#: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Trial length" -msgstr "" +msgstr "Période d'essai" diff --git a/hr_contract_default_trial_length/i18n/hi_IN.po b/hr_contract_default_trial_length/i18n/hi_IN.po new file mode 100644 index 000000000000..b72135ff3f51 --- /dev/null +++ b/hr_contract_default_trial_length/i18n/hi_IN.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_contract_default_trial_length +# +# Translators: +# BS Logics , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: BS Logics , 2017\n" +"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/hi_IN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hi_IN\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type +msgid "Contract Type" +msgstr "अनुबंध का प्रकार" + +#. module: hr_contract_default_trial_length +#: model:ir.model.fields,help:hr_contract_default_trial_length.field_hr_contract_type_trial_length +msgid "Default contract trial length in Days" +msgstr "अनुबंध की पूर्व नियोजित अवधि, दिनों में" + +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + +#. module: hr_contract_default_trial_length +#: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length +msgid "Trial length" +msgstr "परीक्षण की अवधि" diff --git a/hr_contract_default_trial_length/i18n/hr.po b/hr_contract_default_trial_length/i18n/hr.po new file mode 100644 index 000000000000..64f2e95d2bc0 --- /dev/null +++ b/hr_contract_default_trial_length/i18n/hr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_contract_default_trial_length +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type +msgid "Contract Type" +msgstr "Vrsta ugovora" + +#. module: hr_contract_default_trial_length +#: model:ir.model.fields,help:hr_contract_default_trial_length.field_hr_contract_type_trial_length +msgid "Default contract trial length in Days" +msgstr "Zadano trajanje ugovora u danima." + +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + +#. module: hr_contract_default_trial_length +#: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length +msgid "Trial length" +msgstr "Probno trajanje" diff --git a/hr_contract_default_trial_length/i18n/nl_NL.po b/hr_contract_default_trial_length/i18n/nl_NL.po index f8a581f9e1bf..c6f09e5068c8 100644 --- a/hr_contract_default_trial_length/i18n/nl_NL.po +++ b/hr_contract_default_trial_length/i18n/nl_NL.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-28 03:17+0000\n" -"PO-Revision-Date: 2017-03-28 03:17+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: Cas Vissers , 2017\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,6 @@ msgstr "" "Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. module: hr_contract_default_trial_length -#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract -msgid "Contract" -msgstr "Contract" - #. module: hr_contract_default_trial_length #: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type msgid "Contract Type" @@ -33,6 +28,11 @@ msgstr "Contract type" msgid "Default contract trial length in Days" msgstr "" +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + #. module: hr_contract_default_trial_length #: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Trial length" diff --git a/hr_contract_default_trial_length/i18n/pt_BR.po b/hr_contract_default_trial_length/i18n/pt_BR.po index a8e1549c1527..719e81df5273 100644 --- a/hr_contract_default_trial_length/i18n/pt_BR.po +++ b/hr_contract_default_trial_length/i18n/pt_BR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:36+0000\n" -"PO-Revision-Date: 2017-03-03 03:36+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,6 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. module: hr_contract_default_trial_length -#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract -msgid "Contract" -msgstr "Contrato" - #. module: hr_contract_default_trial_length #: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type msgid "Contract Type" @@ -33,6 +28,11 @@ msgstr "Tipo de contrato" msgid "Default contract trial length in Days" msgstr "Duração padrão em dias do contrato de experiência" +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + #. module: hr_contract_default_trial_length #: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Trial length" diff --git a/hr_contract_default_trial_length/i18n/sl.po b/hr_contract_default_trial_length/i18n/sl.po index ad0b1490199d..104975507825 100644 --- a/hr_contract_default_trial_length/i18n/sl.po +++ b/hr_contract_default_trial_length/i18n/sl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:36+0000\n" -"PO-Revision-Date: 2017-03-03 03:36+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,6 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#. module: hr_contract_default_trial_length -#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract -msgid "Contract" -msgstr "Pogodba" - #. module: hr_contract_default_trial_length #: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract_type msgid "Contract Type" @@ -33,6 +28,11 @@ msgstr "Tip pogodbe" msgid "Default contract trial length in Days" msgstr "Privzeto trajanje poskusne dobe v dnevih" +#. module: hr_contract_default_trial_length +#: model:ir.model,name:hr_contract_default_trial_length.model_hr_contract +msgid "Employee Contract" +msgstr "" + #. module: hr_contract_default_trial_length #: model:ir.model.fields,field_description:hr_contract_default_trial_length.field_hr_contract_type_trial_length msgid "Trial length" diff --git a/hr_contract_reference/i18n/hi_IN.po b/hr_contract_reference/i18n/hi_IN.po new file mode 100644 index 000000000000..2c6b76520976 --- /dev/null +++ b/hr_contract_reference/i18n/hi_IN.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_contract_reference +# +# Translators: +# BS Logics , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-29 02:20+0000\n" +"PO-Revision-Date: 2017-07-29 02:20+0000\n" +"Last-Translator: BS Logics , 2017\n" +"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/hi_IN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hi_IN\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_contract_reference +#: model:ir.model,name:hr_contract_reference.model_hr_contract +msgid "Contract" +msgstr "संपर्क " diff --git a/hr_contract_reference/i18n/hr.po b/hr_contract_reference/i18n/hr.po new file mode 100644 index 000000000000..34e6ca63305c --- /dev/null +++ b/hr_contract_reference/i18n/hr.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_contract_reference +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_contract_reference +#: model:ir.model,name:hr_contract_reference.model_hr_contract +msgid "Contract" +msgstr "Ugovor" diff --git a/hr_emergency_contact/i18n/de.po b/hr_emergency_contact/i18n/de.po index ff3b10762c02..2cc4ab1a8ded 100644 --- a/hr_emergency_contact/i18n/de.po +++ b/hr_emergency_contact/i18n/de.po @@ -3,14 +3,15 @@ # * hr_emergency_contact # # Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 01:40+0000\n" -"PO-Revision-Date: 2016-03-22 13:08+0000\n" -"Last-Translator: <>\n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,12 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_emergency_contact -#: view:hr.employee:hr_emergency_contact.hr_employee_view_form -#: field:hr.employee,emergency_contact_ids:0 +#: model:ir.model.fields,field_description:hr_emergency_contact.field_hr_employee_emergency_contact_ids +#: model:ir.ui.view,arch_db:hr_emergency_contact.hr_employee_view_form msgid "Emergency Contacts" msgstr "" #. module: hr_emergency_contact #: model:ir.model,name:hr_emergency_contact.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" diff --git a/hr_emergency_contact/i18n/hr.po b/hr_emergency_contact/i18n/hr.po new file mode 100644 index 000000000000..8d15dd86c85b --- /dev/null +++ b/hr_emergency_contact/i18n/hr.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_emergency_contact +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_emergency_contact +#: model:ir.model.fields,field_description:hr_emergency_contact.field_hr_employee_emergency_contact_ids +#: model:ir.ui.view,arch_db:hr_emergency_contact.hr_employee_view_form +msgid "Emergency Contacts" +msgstr "Kontakt u slučaju nožde" + +#. module: hr_emergency_contact +#: model:ir.model,name:hr_emergency_contact.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" diff --git a/hr_employee_address_improved/README.rst b/hr_employee_address_improved/README.rst new file mode 100644 index 000000000000..78aed40df3e0 --- /dev/null +++ b/hr_employee_address_improved/README.rst @@ -0,0 +1,84 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================ +HR Employee Address Improved +============================ + +When the HR modules are enabled and we have 1 employee for each users, +some parts of the UI become confusing because +we have several partners for the same person: + + 1. res.user inherits from res.partner, + and fields such as the email are stored in there + + 2. hr.employee has address_id and address_home_id. + The first one refers to the work address + (presumably the partner related to the company of the address + of an office of the company, so not a problem) + but the other one is the home address + and if used it will probably be linked to a partner + with the same name as the employee. + +Assumption: we would like to exclude home addresses +from the list of available partners in m2o and m2m fields. + +.. note:: + + when this module is installed a post init hook + **will set all partners related via `address_home_id` as inactive**. + +Installation +============ + +To install this module, you need to: + +* clone the branch 10.0 of the repository https://github.com/OCA/hr +* add the path to this repository in your configuration (addons-path) +* update the module list +* search for "HR Employee Address Improved" in your addons +* install the module + +Configuration +============= + +No extra configuration needed. + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Simone Orsi +* Alexandre Fayolle + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/hr_employee_address_improved/__init__.py b/hr_employee_address_improved/__init__.py new file mode 100644 index 000000000000..e315f7b241f1 --- /dev/null +++ b/hr_employee_address_improved/__init__.py @@ -0,0 +1 @@ +from .hooks import post_init_hook diff --git a/hr_employee_address_improved/__manifest__.py b/hr_employee_address_improved/__manifest__.py new file mode 100644 index 000000000000..3585f2ec84d3 --- /dev/null +++ b/hr_employee_address_improved/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Author: Simone Orsi +# Copyright 2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': 'HR Employee Address Improved', + 'version': '10.0.1.0.0', + 'category': 'Human Resources', + 'author': 'Camptocamp,Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'depends': ['hr'], + 'website': 'http://www.camptocamp.com', + 'data': [ + 'views/hr.xml', + ], + 'installable': True, + 'post_init_hook': 'post_init_hook', +} diff --git a/hr_employee_address_improved/hooks.py b/hr_employee_address_improved/hooks.py new file mode 100644 index 000000000000..a2e2d385b007 --- /dev/null +++ b/hr_employee_address_improved/hooks.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Author: Simone Orsi +# Copyright 2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import SUPERUSER_ID, api +import logging + +logger = logging.getLogger('[hr_employee_address_improved.post_init_hook]') + + +def post_init_hook(cr, pool): + env = api.Environment(cr, SUPERUSER_ID, {}) + partners_count = env['res.partner'].search_count([]) + empls = env['hr.employee'].with_context( + active_test=False).search([('address_home_id', '!=', False)]) + empls.mapped('address_home_id').with_context( + tracking_disable=True).write({'active': False}) + logger.info( + 'Set all partners assigned to `employee.address_home_id` ' + 'as not active. Partners matching: %d out of %d', + len(empls), partners_count + ) diff --git a/hr_expense_analytic_plans/static/description/icon.png b/hr_employee_address_improved/static/description/icon.png similarity index 100% rename from hr_expense_analytic_plans/static/description/icon.png rename to hr_employee_address_improved/static/description/icon.png diff --git a/hr_employee_address_improved/views/hr.xml b/hr_employee_address_improved/views/hr.xml new file mode 100644 index 000000000000..1627859328ed --- /dev/null +++ b/hr_employee_address_improved/views/hr.xml @@ -0,0 +1,25 @@ + + + + hr_employee_address_improved hr.employee.form + hr.employee + + + + ['|', ('active', '=', True), ('active', '=', False)] + { + 'default_supplier': True, + 'default_customer': False, + 'default_active': False, + 'default_partner_id': address_home_id} + + + { + 'show_address': True, + 'default_supplier': True, + 'default_customer': False, + 'default_active': False} + + + + diff --git a/hr_employee_age/i18n/de.po b/hr_employee_age/i18n/de.po index 3aeb5fc344a0..30eb64c5a2e9 100644 --- a/hr_employee_age/i18n/de.po +++ b/hr_employee_age/i18n/de.po @@ -3,21 +3,27 @@ # * hr_employee_age # # Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-20 18:46+0000\n" -"PO-Revision-Date: 2015-10-19 08:39+0000\n" -"Last-Translator: <>\n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: hr_employee_age +#: model:ir.model.fields,field_description:hr_employee_age.field_hr_employee_age +msgid "Age" +msgstr "" + #. module: hr_employee_age #: model:ir.model,name:hr_employee_age.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" diff --git a/hr_employee_age/i18n/hr.po b/hr_employee_age/i18n/hr.po new file mode 100644 index 000000000000..ff7de03b1e44 --- /dev/null +++ b/hr_employee_age/i18n/hr.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_age +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_age +#: model:ir.model.fields,field_description:hr_employee_age.field_hr_employee_age +msgid "Age" +msgstr "Starost" + +#. module: hr_employee_age +#: model:ir.model,name:hr_employee_age.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" diff --git a/hr_employee_birth_name/i18n/de.po b/hr_employee_birth_name/i18n/de.po index 4156f9968e77..09adf98b29e8 100644 --- a/hr_employee_birth_name/i18n/de.po +++ b/hr_employee_birth_name/i18n/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" @@ -26,4 +26,4 @@ msgstr "" #. module: hr_employee_birth_name #: model:ir.model,name:hr_employee_birth_name.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" diff --git a/hr_employee_birth_name/i18n/hr.po b/hr_employee_birth_name/i18n/hr.po new file mode 100644 index 000000000000..768a7d99acf7 --- /dev/null +++ b/hr_employee_birth_name/i18n/hr.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_birth_name +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_birth_name +#: model:ir.model.fields,field_description:hr_employee_birth_name.field_hr_employee_birth_name +msgid "Birth Name" +msgstr "Djevojačko ime" + +#. module: hr_employee_birth_name +#: model:ir.model,name:hr_employee_birth_name.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" diff --git a/hr_employee_category_parent/README.rst b/hr_employee_category_parent/README.rst new file mode 100644 index 000000000000..63f80fd330f1 --- /dev/null +++ b/hr_employee_category_parent/README.rst @@ -0,0 +1,63 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +=========================== +HR Employee Category Parent +=========================== + +This module was written to restore the employee category hierarchy from v8 and before. + +Usage +===== + +To use this module, you need to: + +#. go to some employee category and assign a parent + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/116/10.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Roadmap +======= + +* some hierarchy sensitive name search would be nice. Maybe better create `base_mixin_parent` in server-tools that handles hierarchical structures generally and use it here + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Holger Brunn + +Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list `_ or the `appropriate specialized mailinglist `_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues. + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/hr_employee_category_parent/__init__.py b/hr_employee_category_parent/__init__.py new file mode 100644 index 000000000000..86cb334c3ab5 --- /dev/null +++ b/hr_employee_category_parent/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models diff --git a/hr_employee_category_parent/__manifest__.py b/hr_employee_category_parent/__manifest__.py new file mode 100644 index 000000000000..bb7e107c891f --- /dev/null +++ b/hr_employee_category_parent/__manifest__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "HR Employee Category Parent", + "version": "10.0.1.0.0", + "author": "Therp BV,Odoo Community Association (OCA)", + "license": "AGPL-3", + "category": "Human Resources", + "summary": "Categorize your employee categories", + "depends": [ + 'hr', + ], + "data": [ + "views/hr_employee_category.xml", + ], + "demo": [ + "demo/hr_employee_category.xml", + ], +} diff --git a/hr_employee_category_parent/demo/hr_employee_category.xml b/hr_employee_category_parent/demo/hr_employee_category.xml new file mode 100644 index 000000000000..a0129040ead3 --- /dev/null +++ b/hr_employee_category_parent/demo/hr_employee_category.xml @@ -0,0 +1,16 @@ + + + + + Category 1 + + + Category 2 + + + + Category 3 + + + + diff --git a/hr_employee_category_parent/models/__init__.py b/hr_employee_category_parent/models/__init__.py new file mode 100644 index 000000000000..bcebe9966b38 --- /dev/null +++ b/hr_employee_category_parent/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import hr_employee_category diff --git a/hr_employee_category_parent/models/hr_employee_category.py b/hr_employee_category_parent/models/hr_employee_category.py new file mode 100644 index 000000000000..df652f533259 --- /dev/null +++ b/hr_employee_category_parent/models/hr_employee_category.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from openerp import _, api, exceptions, fields, models + + +class HrEmployeeCategory(models.Model): + _inherit = 'hr.employee.category' + + parent_id = fields.Many2one('hr.employee.category', 'Parent category') + + @api.multi + def name_get(self): + return [ + ( + this.id, + ' / '.join( + p.name for p in reversed(list(this._iter_parents(True))) + ), + ) + for this in self + ] + + @api.multi + def _iter_parents(self, include_self=False): + self.ensure_one() + if not include_self: + self = self.parent_id + while self: + yield self + self = self.parent_id + + @api.constrains('parent_id') + def _constrain_parent_id(self): + for this in self: + for parent in this._iter_parents(): + if parent == this: + raise exceptions.ValidationError( + _('You can\'t create cyclic hierarchies'), + ) diff --git a/hr_employee_category_parent/static/description/icon.png b/hr_employee_category_parent/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/hr_employee_category_parent/static/description/icon.png differ diff --git a/hr_employee_category_parent/tests/__init__.py b/hr_employee_category_parent/tests/__init__.py new file mode 100644 index 000000000000..18d631eff457 --- /dev/null +++ b/hr_employee_category_parent/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import test_hr_employee_category_parent diff --git a/hr_employee_category_parent/tests/test_hr_employee_category_parent.py b/hr_employee_category_parent/tests/test_hr_employee_category_parent.py new file mode 100644 index 000000000000..5925b2bb8dfa --- /dev/null +++ b/hr_employee_category_parent/tests/test_hr_employee_category_parent.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import exceptions +from openerp.tests.common import TransactionCase + + +class TestHrCategoryParent(TransactionCase): + def test_hr_employee_category_parent(self): + with self.assertRaises(exceptions.ValidationError): + with self.env.cr.savepoint(): + self.env.ref('hr_employee_category_parent.cat3').write({ + 'parent_id': + self.env.ref('hr_employee_category_parent.cat3').id, + }) + with self.assertRaises(exceptions.ValidationError): + with self.env.cr.savepoint(): + self.env.ref('hr_employee_category_parent.cat1').write({ + 'parent_id': + self.env.ref('hr_employee_category_parent.cat3').id, + }) + self.assertEqual( + self.env.ref('hr_employee_category_parent.cat3').display_name, + 'Category 1 / Category 2 / Category 3', + ) diff --git a/hr_employee_category_parent/views/hr_employee_category.xml b/hr_employee_category_parent/views/hr_employee_category.xml new file mode 100644 index 000000000000..da9b445cc4a2 --- /dev/null +++ b/hr_employee_category_parent/views/hr_employee_category.xml @@ -0,0 +1,24 @@ + + + + + hr.employee.category + + + + + + + + + hr.employee.category + + + + + + + + + + diff --git a/hr_employee_firstname/i18n/hr.po b/hr_employee_firstname/i18n/hr.po new file mode 100644 index 000000000000..f1e1dfd3e6e0 --- /dev/null +++ b/hr_employee_firstname/i18n/hr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_firstname +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_firstname +#: model:ir.model,name:hr_employee_firstname.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_firstname +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_firstname +msgid "Firstname" +msgstr "Ime" + +#. module: hr_employee_firstname +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_lastname +msgid "Lastname" +msgstr "Prezime" diff --git a/hr_employee_id/README.rst b/hr_employee_id/README.rst index a275de1b5fe9..2146720d5d33 100644 --- a/hr_employee_id/README.rst +++ b/hr_employee_id/README.rst @@ -14,6 +14,10 @@ Company wide unique employee ID. Supports: This module supports sequence of employee ID which will be generated automatically from the sequence predefined. +Nevertheless, if you need a difference ID in particular cases +you can pass a custom value for `identification_id`: if you do it +no automatic generation happens. + Installation ============ @@ -70,6 +74,7 @@ Contributors * Adrien Peiffer (ACSONE) * Salton Massally (iDT Labs) * Andhitia Rama (OpenSynergy Indonesia) +* Simone Orsi Maintainer ---------- diff --git a/hr_employee_id/__manifest__.py b/hr_employee_id/__manifest__.py index e4d46c3943cc..42c65368b99d 100644 --- a/hr_employee_id/__manifest__.py +++ b/hr_employee_id/__manifest__.py @@ -4,11 +4,12 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Employee ID', - 'version': '10.0.1.0.0', + 'version': '10.0.1.1.0', 'license': 'AGPL-3', 'category': 'Generic Modules/Human Resources', 'author': 'Michael Telahun Makonnen, ' 'OpenSynergy Indonesia,' + 'Camptocamp,' 'Odoo Community Association (OCA)', 'website': 'http://miketelahun.wordpress.com', 'depends': [ diff --git a/hr_employee_id/i18n/de.po b/hr_employee_id/i18n/de.po index a7029d67ff13..bdef320b787a 100644 --- a/hr_employee_id/i18n/de.po +++ b/hr_employee_id/i18n/de.po @@ -3,14 +3,15 @@ # * hr_employee_id # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 +# Niki Waibel , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-29 01:35+0000\n" -"PO-Revision-Date: 2016-11-29 01:35+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Niki Waibel , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,22 +61,22 @@ msgstr "" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid msgid "Created by" -msgstr "" +msgstr "Erstellt von" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date msgid "Created on" -msgstr "" +msgstr "Angelegt am" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name msgid "Display Name" -msgstr "" +msgstr "Anzeigename" #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" #. module: hr_employee_id #: model:ir.ui.menu,name:hr_employee_id.menu_account_config @@ -96,7 +97,7 @@ msgstr "" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id msgid "ID" -msgstr "" +msgstr "ID" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method @@ -107,17 +108,17 @@ msgstr "" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update msgid "Last Modified on" -msgstr "" +msgstr "Zuletzt geändert am" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid msgid "Last Updated by" -msgstr "" +msgstr "Zuletzt aktualisiert durch" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date msgid "Last Updated on" -msgstr "" +msgstr "Zuletzt aktualisiert am" #. module: hr_employee_id #: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits @@ -147,7 +148,7 @@ msgid "The Employee Number must be unique across the company(s)." msgstr "" #. module: hr_employee_id -#: code:addons/hr_employee_id/models/hr_employee.py:50 +#: code:addons/hr_employee_id/models/hr_employee.py:49 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." diff --git a/hr_employee_id/i18n/es.po b/hr_employee_id/i18n/es.po index 55ce15a4ee0a..93c5c60dd401 100644 --- a/hr_employee_id/i18n/es.po +++ b/hr_employee_id/i18n/es.po @@ -3,15 +3,15 @@ # * hr_employee_id # # Translators: -# OCA Transbot , 2016 -# José Antonio Cuello , 2016 +# José Antonio Cuello , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-29 01:35+0000\n" -"PO-Revision-Date: 2016-11-29 01:35+0000\n" -"Last-Translator: José Antonio Cuello , 2016\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +68,7 @@ msgstr "Creado por" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date msgid "Created on" -msgstr "Creado en" +msgstr "Creado el" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name @@ -150,7 +150,7 @@ msgid "The Employee Number must be unique across the company(s)." msgstr "El ID de empleado debe ser único en la(s) compañía(s)" #. module: hr_employee_id -#: code:addons/hr_employee_id/models/hr_employee.py:50 +#: code:addons/hr_employee_id/models/hr_employee.py:49 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." diff --git a/hr_employee_id/i18n/fr.po b/hr_employee_id/i18n/fr.po index c7081158f0c1..4655dde0d365 100644 --- a/hr_employee_id/i18n/fr.po +++ b/hr_employee_id/i18n/fr.po @@ -3,15 +3,16 @@ # * hr_employee_id # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 # leemannd , 2017 +# guillaume bauer , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" -"Last-Translator: leemannd , 2017\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: guillaume bauer , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,11 +32,13 @@ msgid "" "(*) This configuration is related to the company you're logged " "into." msgstr "" +"(*) Cette configuration est liée à la société dans laquelle vous vous " +"êtes connecté " #. module: hr_employee_id #: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration msgid "Apply" -msgstr "" +msgstr "Appliquer" #. module: hr_employee_id #: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration @@ -56,7 +59,7 @@ msgstr "Entreprise" #: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config #: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration msgid "Configure Employee ID" -msgstr "" +msgstr "Renseigner l' ID de l'employé" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid @@ -113,12 +116,12 @@ msgstr "Dernière modification le" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid msgid "Last Updated by" -msgstr "Mis-à-jour par" +msgstr "Dernière modification par" #. module: hr_employee_id #: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date msgid "Last Updated on" -msgstr "Mis-à-jour le" +msgstr "Dernière mise à jour le" #. module: hr_employee_id #: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits @@ -148,7 +151,7 @@ msgid "The Employee Number must be unique across the company(s)." msgstr "Le numéro d'employé doit être unique par société(s)." #. module: hr_employee_id -#: code:addons/hr_employee_id/models/hr_employee.py:50 +#: code:addons/hr_employee_id/models/hr_employee.py:49 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." @@ -157,4 +160,4 @@ msgstr "Impossible de générer le numéro d'ID employé qui doit être unique." #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings msgid "hr.employeeid.config.settings" -msgstr "" +msgstr "hr.employeeid.config.settings" diff --git a/hr_employee_id/i18n/hr.po b/hr_employee_id/i18n/hr.po new file mode 100644 index 000000000000..aa53b8be3692 --- /dev/null +++ b/hr_employee_id/i18n/hr.po @@ -0,0 +1,159 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits +msgid "# of Digits" +msgstr "# znamenaka" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "Primjeni" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "Odustani" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Organizacije" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "Organizacija" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "Postavi ID djelatnika" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_id +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config +msgid "Employee ID" +msgstr "ID djelatnika" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "ID djelatnika *" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "Sekvenca ID djelatnika" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method +msgid "ID Generation Method" +msgstr "Metoda generianja ID-a" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits +msgid "Number of digits making up the ID" +msgstr "Broj znamekana za stvaranje ID-a" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" +msgstr "Uzorak za kreiranje ID-djelatnika" + +#. module: hr_employee_id +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "Slučajno" + +#. module: hr_employee_id +#: selection:res.company,employee_id_gen_method:0 +msgid "Sequence" +msgstr "Sekvenca" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "Šifra djelatnika mora biti jedinstvena unutar(između) poduzeća" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:49 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "Nije moguće generirati jedinstvenu šifru djelatnika." + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "hr.employeeid.config.settings" diff --git a/hr_employee_id/i18n/hr_HR.po b/hr_employee_id/i18n/hr_HR.po index 2ee053b2e149..da437d0b7a34 100644 --- a/hr_employee_id/i18n/hr_HR.po +++ b/hr_employee_id/i18n/hr_HR.po @@ -3,14 +3,14 @@ # * hr_employee_id # # Translators: -# Bole , 2016 +# Bole , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-29 03:45+0000\n" -"PO-Revision-Date: 2016-11-29 03:45+0000\n" -"Last-Translator: Bole , 2016\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Bole , 2017\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -149,7 +149,7 @@ msgid "The Employee Number must be unique across the company(s)." msgstr "ID broj djelatnika mora biti jedinstven za poduzeće(a)." #. module: hr_employee_id -#: code:addons/hr_employee_id/models/hr_employee.py:50 +#: code:addons/hr_employee_id/models/hr_employee.py:49 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." diff --git a/hr_employee_id/i18n/it.po b/hr_employee_id/i18n/it.po index 6813358d735b..e47b7c59b8d4 100644 --- a/hr_employee_id/i18n/it.po +++ b/hr_employee_id/i18n/it.po @@ -3,15 +3,15 @@ # * hr_employee_id # # Translators: -# Paolo Valier, 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-12 12:02+0000\n" -"PO-Revision-Date: 2016-03-19 10:40+0000\n" -"Last-Translator: Paolo Valier\n" -"Language-Team: Italian (http://www.transifex.com/oca/OCA-hr-8-0/language/it/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,56 +19,125 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" msgstr "" +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Aziende" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Creato da" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Creato il" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Dipendente" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" msgstr "" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Ultimo aggiornamento di" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Ultimo aggiornamento il" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence msgid "Pattern to be used for employee ID Generation" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "" @@ -78,8 +147,13 @@ msgid "The Employee Number must be unique across the company(s)." msgstr "" #. module: hr_employee_id -#: code:addons/hr_employee_id/models/hr_employee.py:50 +#: code:addons/hr_employee_id/models/hr_employee.py:49 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "" diff --git a/hr_employee_id/i18n/nl_NL.po b/hr_employee_id/i18n/nl_NL.po index 8d64101a8246..b85b071c62b0 100644 --- a/hr_employee_id/i18n/nl_NL.po +++ b/hr_employee_id/i18n/nl_NL.po @@ -3,15 +3,16 @@ # * hr_employee_id # # Translators: -# OCA Transbot , 2016 # Peter Hageman , 2017 +# Cas Vissers , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-01 01:04+0000\n" -"PO-Revision-Date: 2017-07-01 01:04+0000\n" -"Last-Translator: Peter Hageman , 2017\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,7 +151,7 @@ msgid "The Employee Number must be unique across the company(s)." msgstr "Het Personeelsnummer moet uniek zijn binnen elk bedrijf en bedrijven." #. module: hr_employee_id -#: code:addons/hr_employee_id/models/hr_employee.py:50 +#: code:addons/hr_employee_id/models/hr_employee.py:49 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." diff --git a/hr_employee_id/i18n/sl.po b/hr_employee_id/i18n/sl.po index d29d69f96976..fe676e3160ef 100644 --- a/hr_employee_id/i18n/sl.po +++ b/hr_employee_id/i18n/sl.po @@ -3,14 +3,14 @@ # * hr_employee_id # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,7 +147,7 @@ msgid "The Employee Number must be unique across the company(s)." msgstr "Številka kadra mora biti unikatna v sklopu družbe (družb)." #. module: hr_employee_id -#: code:addons/hr_employee_id/models/hr_employee.py:50 +#: code:addons/hr_employee_id/models/hr_employee.py:49 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." diff --git a/hr_employee_id/models/hr_employee.py b/hr_employee_id/models/hr_employee.py index 5afe02c79379..a79265a21290 100644 --- a/hr_employee_id/models/hr_employee.py +++ b/hr_employee_id/models/hr_employee.py @@ -30,8 +30,7 @@ def _generate_identification_id(self): company = self.env.user.company_id employee_id = False if company.employee_id_gen_method == 'sequence': - employee_id = self.env['ir.sequence'].get_id( - company.employee_id_sequence.id) + employee_id = company.employee_id_sequence.next_by_id() elif company.employee_id_gen_method == 'random': employee_id_random_digits = company.employee_id_random_digits tries = 0 @@ -53,6 +52,6 @@ def _generate_identification_id(self): @api.model def create(self, vals): - eid = self._generate_identification_id() - vals['identification_id'] = eid + if not vals.get('identification_id'): + vals['identification_id'] = self._generate_identification_id() return super(HrEmployee, self).create(vals) diff --git a/hr_employee_id/tests/test_employee_id.py b/hr_employee_id/tests/test_employee_id.py index af783ecb6dfc..da3ed0453a3c 100644 --- a/hr_employee_id/tests/test_employee_id.py +++ b/hr_employee_id/tests/test_employee_id.py @@ -35,6 +35,18 @@ def test_sequences_id_generation(self): self.assertTrue(len(employee.identification_id)) + def test_custom_id(self): + # if we pass the ID no generation occurs. + # Let's set a sequence and check that is not used at all + self.company.write({'employee_id_gen_method': 'sequence', + 'employee_id_sequence': self.sequence.id}) + number = self.sequence.number_next + employee = self.employee_model.create({ + 'name': 'Employee', 'identification_id': 'THERE_YOU_GO' + }) + self.assertEqual(employee.identification_id, 'THERE_YOU_GO') + self.assertEqual(self.sequence.number_next, number) + def test_configuration_default_values(self): # test loading of default configuration values self.company.write({'employee_id_gen_method': None, diff --git a/hr_employee_legacy_id/README.rst b/hr_employee_legacy_id/README.rst index 49a6c28edfd0..380e3fca959a 100644 --- a/hr_employee_legacy_id/README.rst +++ b/hr_employee_legacy_id/README.rst @@ -23,6 +23,7 @@ Contributors * Michael Telahun Makonnen * Adrien Peiffer (ACSONE) +* Meyomesse Gilles Maintainer ---------- diff --git a/hr_employee_legacy_id/__manifest__.py b/hr_employee_legacy_id/__manifest__.py index 7dbe46a045d8..3e86ce8f2cf1 100644 --- a/hr_employee_legacy_id/__manifest__.py +++ b/hr_employee_legacy_id/__manifest__.py @@ -1,27 +1,10 @@ -# -*- coding:utf-8 -*- -# -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# All Rights Reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -# +# -*- coding: utf-8 -*- +# © 2011, 2013 Michael Telahun Makonnen +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Legacy Employee ID', - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'category': 'Generic Modules/Human Resources', 'author': "Michael Telahun Makonnen ," "Odoo Community Association (OCA)", @@ -33,5 +16,5 @@ 'data': [ 'views/hr_view.xml', ], - 'installable': False, + 'installable': True, } diff --git a/hr_employee_legacy_id/i18n/de.po b/hr_employee_legacy_id/i18n/de.po index df1fb373c21a..80b78acdf51f 100644 --- a/hr_employee_legacy_id/i18n/de.po +++ b/hr_employee_legacy_id/i18n/de.po @@ -3,15 +3,15 @@ # * hr_employee_legacy_id # # Translators: -# Thomas A. Jaeger, 2015 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-06 00:27+0000\n" -"PO-Revision-Date: 2015-11-05 14:13+0000\n" -"Last-Translator: Thomas A. Jaeger\n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -24,6 +24,11 @@ msgid "Employee" msgstr "Angestellter" #. module: hr_employee_legacy_id -#: field:hr.employee,legacy_no:0 +#: model:ir.model.fields,field_description:hr_employee_legacy_id.field_hr_employee_legacy_no msgid "Legacy ID" -msgstr "Alte ID" +msgstr "" + +#. module: hr_employee_legacy_id +#: model:ir.ui.view,arch_db:hr_employee_legacy_id.view_employee_form +msgid "Legacy No" +msgstr "" diff --git a/hr_employee_legacy_id/i18n/fr.po b/hr_employee_legacy_id/i18n/fr.po index f4f956547f57..c57ddcdc15bc 100644 --- a/hr_employee_legacy_id/i18n/fr.po +++ b/hr_employee_legacy_id/i18n/fr.po @@ -1,19 +1,22 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * hr_employee_legacy_id -# +# * hr_employee_legacy_id +# +# Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-27 09:30+0000\n" -"PO-Revision-Date: 2015-07-27 09:30+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_employee_legacy_id #: model:ir.model,name:hr_employee_legacy_id.model_hr_employee @@ -21,7 +24,11 @@ msgid "Employee" msgstr "Employé" #. module: hr_employee_legacy_id -#: field:hr.employee,legacy_no:0 +#: model:ir.model.fields,field_description:hr_employee_legacy_id.field_hr_employee_legacy_no msgid "Legacy ID" -msgstr "Ancien identifiant" +msgstr "" +#. module: hr_employee_legacy_id +#: model:ir.ui.view,arch_db:hr_employee_legacy_id.view_employee_form +msgid "Legacy No" +msgstr "" diff --git a/hr_employee_legacy_id/i18n/hr.po b/hr_employee_legacy_id/i18n/hr.po new file mode 100644 index 000000000000..92e9e30aab61 --- /dev/null +++ b/hr_employee_legacy_id/i18n/hr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_legacy_id +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_legacy_id +#: model:ir.model,name:hr_employee_legacy_id.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_legacy_id +#: model:ir.model.fields,field_description:hr_employee_legacy_id.field_hr_employee_legacy_no +msgid "Legacy ID" +msgstr "" + +#. module: hr_employee_legacy_id +#: model:ir.ui.view,arch_db:hr_employee_legacy_id.view_employee_form +msgid "Legacy No" +msgstr "" diff --git a/hr_employee_legacy_id/i18n/hr_HR.po b/hr_employee_legacy_id/i18n/hr_HR.po new file mode 100644 index 000000000000..c390b3337371 --- /dev/null +++ b/hr_employee_legacy_id/i18n/hr_HR.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_legacy_id +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_legacy_id +#: model:ir.model,name:hr_employee_legacy_id.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_legacy_id +#: model:ir.model.fields,field_description:hr_employee_legacy_id.field_hr_employee_legacy_no +msgid "Legacy ID" +msgstr "" + +#. module: hr_employee_legacy_id +#: model:ir.ui.view,arch_db:hr_employee_legacy_id.view_employee_form +msgid "Legacy No" +msgstr "" diff --git a/hr_employee_legacy_id/i18n/nl_NL.po b/hr_employee_legacy_id/i18n/nl_NL.po new file mode 100644 index 000000000000..98862d39aeb7 --- /dev/null +++ b/hr_employee_legacy_id/i18n/nl_NL.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_legacy_id +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_employee_legacy_id +#: model:ir.model,name:hr_employee_legacy_id.model_hr_employee +msgid "Employee" +msgstr "Werknemer" + +#. module: hr_employee_legacy_id +#: model:ir.model.fields,field_description:hr_employee_legacy_id.field_hr_employee_legacy_no +msgid "Legacy ID" +msgstr "" + +#. module: hr_employee_legacy_id +#: model:ir.ui.view,arch_db:hr_employee_legacy_id.view_employee_form +msgid "Legacy No" +msgstr "" diff --git a/hr_employee_legacy_id/i18n/pt_BR.po b/hr_employee_legacy_id/i18n/pt_BR.po index 03ae45b1ac33..03251a553ec1 100644 --- a/hr_employee_legacy_id/i18n/pt_BR.po +++ b/hr_employee_legacy_id/i18n/pt_BR.po @@ -3,15 +3,15 @@ # * hr_employee_legacy_id # # Translators: -# danimaribeiro , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-08 03:18+0000\n" -"Last-Translator: danimaribeiro \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-hr-8-0/language/pt_BR/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -24,6 +24,11 @@ msgid "Employee" msgstr "Empregado" #. module: hr_employee_legacy_id -#: field:hr.employee,legacy_no:0 +#: model:ir.model.fields,field_description:hr_employee_legacy_id.field_hr_employee_legacy_no msgid "Legacy ID" -msgstr "Id Legado" +msgstr "" + +#. module: hr_employee_legacy_id +#: model:ir.ui.view,arch_db:hr_employee_legacy_id.view_employee_form +msgid "Legacy No" +msgstr "" diff --git a/hr_employee_legacy_id/i18n/sl.po b/hr_employee_legacy_id/i18n/sl.po index bd6b9464b949..541900a34187 100644 --- a/hr_employee_legacy_id/i18n/sl.po +++ b/hr_employee_legacy_id/i18n/sl.po @@ -3,15 +3,15 @@ # * hr_employee_legacy_id # # Translators: -# Matjaž Mozetič , 2015 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-18 13:10+0000\n" -"PO-Revision-Date: 2015-08-16 11:40+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-hr-8-0/language/sl/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -24,6 +24,11 @@ msgid "Employee" msgstr "Kader" #. module: hr_employee_legacy_id -#: field:hr.employee,legacy_no:0 +#: model:ir.model.fields,field_description:hr_employee_legacy_id.field_hr_employee_legacy_no msgid "Legacy ID" -msgstr "Dedovani ID" +msgstr "" + +#. module: hr_employee_legacy_id +#: model:ir.ui.view,arch_db:hr_employee_legacy_id.view_employee_form +msgid "Legacy No" +msgstr "" diff --git a/hr_employee_legacy_id/models/hr.py b/hr_employee_legacy_id/models/hr.py index b3e353c2e448..37b71aa0661c 100644 --- a/hr_employee_legacy_id/models/hr.py +++ b/hr_employee_legacy_id/models/hr.py @@ -19,7 +19,7 @@ # # -from openerp import models, fields +from odoo import fields, models class hr_employee(models.Model): diff --git a/hr_employee_legacy_id/views/hr_view.xml b/hr_employee_legacy_id/views/hr_view.xml index fc7618596e16..fe591962bc40 100644 --- a/hr_employee_legacy_id/views/hr_view.xml +++ b/hr_employee_legacy_id/views/hr_view.xml @@ -1,5 +1,7 @@ - + + @@ -7,11 +9,11 @@ hr.employee - - + + - - + + @@ -20,11 +22,9 @@ hr.employee - - - - - + + + @@ -40,4 +40,4 @@ - + diff --git a/hr_employee_phone_extension/i18n/hr.po b/hr_employee_phone_extension/i18n/hr.po new file mode 100644 index 000000000000..4145dc778bee --- /dev/null +++ b/hr_employee_phone_extension/i18n/hr.po @@ -0,0 +1,44 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_phone_extension +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_phone_extension +#: model:ir.model,name:hr_employee_phone_extension.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_phone_extension +#: model:ir.model.fields,field_description:hr_employee_phone_extension.field_hr_employee_internal_number +msgid "Internal Number" +msgstr "Interni broj" + +#. module: hr_employee_phone_extension +#: model:ir.model.fields,help:hr_employee_phone_extension.field_hr_employee_internal_number +msgid "Internal phone number." +msgstr "Interni tel. broj" + +#. module: hr_employee_phone_extension +#: model:ir.model.fields,field_description:hr_employee_phone_extension.field_hr_employee_short_number +msgid "Short Number" +msgstr "Kratni broj" + +#. module: hr_employee_phone_extension +#: model:ir.model.fields,help:hr_employee_phone_extension.field_hr_employee_short_number +msgid "Short phone number." +msgstr "Kratki broj telefona." diff --git a/hr_employee_seniority/__manifest__.py b/hr_employee_seniority/__manifest__.py index 05afa16529de..002a31816d41 100644 --- a/hr_employee_seniority/__manifest__.py +++ b/hr_employee_seniority/__manifest__.py @@ -7,7 +7,7 @@ { 'name': 'Employee Seniority', 'summary': 'Keep Track of Length of Employment', - 'version': '10.0.1.0.0', + 'version': '10.0.1.0.2', 'category': 'Human Resources', 'author': "Michael Telahun Makonnen , " "Camptocamp SA, " diff --git a/hr_employee_seniority/i18n/de.po b/hr_employee_seniority/i18n/de.po index b5136cbea337..0d613f556330 100644 --- a/hr_employee_seniority/i18n/de.po +++ b/hr_employee_seniority/i18n/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-10 19:09+0000\n" -"PO-Revision-Date: 2017-03-10 19:09+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "" #. module: hr_employee_seniority #: model:ir.model,name:hr_employee_seniority.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" #. module: hr_employee_seniority #: model:ir.model.fields,field_description:hr_employee_seniority.field_hr_employee_initial_employment_date diff --git a/hr_employee_seniority/i18n/hr.po b/hr_employee_seniority/i18n/hr.po new file mode 100644 index 000000000000..763b27296a52 --- /dev/null +++ b/hr_employee_seniority/i18n/hr.po @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_seniority +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_seniority +#: model:ir.model.fields,help:hr_employee_seniority.field_hr_employee_initial_employment_date +msgid "" +"Date of first employment if it was before the start of the first contract in" +" the system." +msgstr "" +"Datum prvog zapošljavanja ako je bio prije početka prvog ugovora u sustavu." + +#. module: hr_employee_seniority +#: model:ir.ui.view,arch_db:hr_employee_seniority.hr_employee_view_form_inherit +msgid "Duration of Service" +msgstr "Trajanje odnosa" + +#. module: hr_employee_seniority +#: model:ir.model,name:hr_employee_seniority.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_seniority +#: model:ir.model.fields,field_description:hr_employee_seniority.field_hr_employee_initial_employment_date +msgid "Initial Date of Employment" +msgstr "Početni datum zapošljavanja" + +#. module: hr_employee_seniority +#: model:ir.model.fields,field_description:hr_employee_seniority.field_hr_employee_length_of_service +msgid "Months of Service" +msgstr "Mjeseci rada" diff --git a/hr_employee_seniority/models/hr_employee.py b/hr_employee_seniority/models/hr_employee.py index 4a894a9fb902..affa169bd74d 100644 --- a/hr_employee_seniority/models/hr_employee.py +++ b/hr_employee_seniority/models/hr_employee.py @@ -24,7 +24,7 @@ class HrEmployee(models.Model): ) def _first_contract(self): - Contract = self.env['hr.contract'] + Contract = self.env['hr.contract'].sudo() return Contract.search([('employee_id', '=', self.id)], order='date_start asc', limit=1) @@ -41,13 +41,14 @@ def check_next_days(date_to, date_from): @api.depends('contract_ids', 'initial_employment_date') def _compute_months_service(self): date_now = fields.Date.today() + Contract = self.env['hr.contract'].sudo() for employee in self: nb_month = 0 if employee.initial_employment_date: - if employee.contract_ids: - contract = employee._first_contract() - to_dt = fields.Date.from_string(contract.date_start) + first_contract = employee._first_contract() + if first_contract: + to_dt = fields.Date.from_string(first_contract.date_start) else: to_dt = fields.Date.from_string(date_now) @@ -58,7 +59,9 @@ def _compute_months_service(self): relativedelta(to_dt, from_dt).months + \ self.check_next_days(to_dt, from_dt) - for contract in employee.contract_ids: + contracts = Contract.search([('employee_id', '=', employee.id)], + order='date_start asc') + for contract in contracts: from_dt = fields.Date.from_string(contract.date_start) if contract.date_end and contract.date_end < date_now: to_dt = fields.Date.from_string(contract.date_end) diff --git a/hr_employee_social_media/i18n/de.po b/hr_employee_social_media/i18n/de.po index e946699bf58b..06e43c11f5bc 100644 --- a/hr_employee_social_media/i18n/de.po +++ b/hr_employee_social_media/i18n/de.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "Anzeigename" #: model:ir.model,name:hr_employee_social_media.model_hr_employee #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_employee_id msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" #. module: hr_employee_social_media #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_id @@ -75,7 +75,7 @@ msgstr "Zuletzt aktualisiert am" #. module: hr_employee_social_media #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_name msgid "Name" -msgstr "Bezeichnung" +msgstr "Name" #. module: hr_employee_social_media #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_hr_social_media_id diff --git a/hr_employee_social_media/i18n/es.po b/hr_employee_social_media/i18n/es.po index 6ffbe16a5fb1..758a07015eea 100644 --- a/hr_employee_social_media/i18n/es.po +++ b/hr_employee_social_media/i18n/es.po @@ -3,14 +3,14 @@ # * hr_employee_social_media # # Translators: -# José Antonio Cuello , 2017 +# José Antonio Cuello , 2017 # OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" @@ -70,7 +70,7 @@ msgstr "Última actualización por" #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_write_date #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_write_date msgid "Last Updated on" -msgstr "Última actualización en" +msgstr "Última actualización el" #. module: hr_employee_social_media #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_name diff --git a/hr_employee_social_media/i18n/hr.po b/hr_employee_social_media/i18n/hr.po new file mode 100644 index 000000000000..71a29eda5f12 --- /dev/null +++ b/hr_employee_social_media/i18n/hr.po @@ -0,0 +1,111 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_social_media +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_account_name +msgid "Account" +msgstr "Konto" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_create_uid +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_create_date +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_display_name +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_employee_social_media +#: model:ir.model,name:hr_employee_social_media.model_hr_employee +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_employee_id +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_id +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media___last_update +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_write_uid +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_write_date +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_name +msgid "Name" +msgstr "Naziv" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_hr_social_media_id +#: model:ir.ui.view,arch_db:hr_employee_social_media.hr_social_media_view_tree +msgid "Social Media" +msgstr "Društvene mreže" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_employee_social_media_account_ids +#: model:ir.ui.view,arch_db:hr_employee_social_media.view_employee_form_inherit_extension +msgid "Social Media Accounts" +msgstr "Računi društvenih mreža" + +#. module: hr_employee_social_media +#: model:ir.actions.act_window,name:hr_employee_social_media.action_hr_social_media +#: model:ir.ui.menu,name:hr_employee_social_media.hr_menu_social_media +#: model:ir.ui.view,arch_db:hr_employee_social_media.hr_social_media_view_form +msgid "Social Medias" +msgstr "Drištvene mreže" + +#. module: hr_employee_social_media +#: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_social_url +msgid "Website" +msgstr "Webstranica" + +#. module: hr_employee_social_media +#: model:ir.model,name:hr_employee_social_media.model_hr_social_media +msgid "hr.social.media" +msgstr "hr.social.media" + +#. module: hr_employee_social_media +#: model:ir.model,name:hr_employee_social_media.model_hr_social_media_account +msgid "hr.social.media.account" +msgstr "hr.social.media.account" diff --git a/hr_employee_social_media/i18n/sl.po b/hr_employee_social_media/i18n/sl.po index 442d38818d91..6047d4ae67ef 100644 --- a/hr_employee_social_media/i18n/sl.po +++ b/hr_employee_social_media/i18n/sl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "Zadnjič posodobljeno" #. module: hr_employee_social_media #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_name msgid "Name" -msgstr "Naziv" +msgstr "Ime" #. module: hr_employee_social_media #: model:ir.model.fields,field_description:hr_employee_social_media.field_hr_social_media_account_hr_social_media_id diff --git a/hr_expense_analytic_distribution/README.rst b/hr_expense_analytic_distribution/README.rst new file mode 100644 index 000000000000..a5e24ec3d8ce --- /dev/null +++ b/hr_expense_analytic_distribution/README.rst @@ -0,0 +1,54 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================== +Use analytic plans in expenses +============================== + +This module allows you to assign analytic distribution to expense lines +instead of analytic accounts. This way, you can distribute the costs of an +expense over multiple analytic accounts. + +Usage +===== + +Create an analytic distribution and set this distribution on an expense. +Process expense as always and analytic distribution will be propagated to move +lines of expense. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/116/10.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. In +case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smash it by providing detailed and welcomed +feedback. + +Credits +======= + +Contributors +------------ + +* Holger Brunn +* Vicent Cubells + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/hr_expense_analytic_distribution/__init__.py b/hr_expense_analytic_distribution/__init__.py new file mode 100644 index 000000000000..aab6d6e28d93 --- /dev/null +++ b/hr_expense_analytic_distribution/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Therp BV . +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models diff --git a/hr_expense_analytic_distribution/__manifest__.py b/hr_expense_analytic_distribution/__manifest__.py new file mode 100644 index 000000000000..075f1c2da373 --- /dev/null +++ b/hr_expense_analytic_distribution/__manifest__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Therp BV . +# Copyright 2017 Vicent Cubells - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Analytic distributions in expenses", + "version": "10.0.1.0.0", + "author": "Therp BV, " + "Tecnativa, " + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "category": "Human Resources", + "summary": "Use analytic plans in expenses", + "depends": [ + 'hr_expense', + 'account_analytic_distribution', + ], + "data": [ + "views/hr_expense.xml", + ], + "auto_install": False, + 'installable': True, +} diff --git a/hr_expense_analytic_distribution/i18n/de.po b/hr_expense_analytic_distribution/i18n/de.po new file mode 100644 index 000000000000..982d1ba529a2 --- /dev/null +++ b/hr_expense_analytic_distribution/i18n/de.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_analytic_distribution +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-12 02:47+0000\n" +"PO-Revision-Date: 2017-06-12 02:47+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_expense_analytic_distribution +#: model:ir.model.fields,field_description:hr_expense_analytic_distribution.field_hr_expense_analytic_distribution_id +msgid "Analytic distribution" +msgstr "" + +#. module: hr_expense_analytic_distribution +#: model:ir.model,name:hr_expense_analytic_distribution.model_hr_expense +msgid "Expense" +msgstr "Spesen" diff --git a/hr_expense_analytic_distribution/i18n/es.po b/hr_expense_analytic_distribution/i18n/es.po new file mode 100644 index 000000000000..5238e1e08c27 --- /dev/null +++ b/hr_expense_analytic_distribution/i18n/es.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_analytic_distribution +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-12 02:47+0000\n" +"PO-Revision-Date: 2017-06-12 02:47+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_expense_analytic_distribution +#: model:ir.model.fields,field_description:hr_expense_analytic_distribution.field_hr_expense_analytic_distribution_id +msgid "Analytic distribution" +msgstr "" + +#. module: hr_expense_analytic_distribution +#: model:ir.model,name:hr_expense_analytic_distribution.model_hr_expense +msgid "Expense" +msgstr "Gasto" diff --git a/hr_expense_analytic_distribution/i18n/fi.po b/hr_expense_analytic_distribution/i18n/fi.po new file mode 100644 index 000000000000..e2af8b74caaa --- /dev/null +++ b/hr_expense_analytic_distribution/i18n/fi.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_analytic_distribution +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-12 02:47+0000\n" +"PO-Revision-Date: 2017-06-12 02:47+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_expense_analytic_distribution +#: model:ir.model.fields,field_description:hr_expense_analytic_distribution.field_hr_expense_analytic_distribution_id +msgid "Analytic distribution" +msgstr "" + +#. module: hr_expense_analytic_distribution +#: model:ir.model,name:hr_expense_analytic_distribution.model_hr_expense +msgid "Expense" +msgstr "Kulu" diff --git a/hr_expense_analytic_distribution/i18n/fr.po b/hr_expense_analytic_distribution/i18n/fr.po new file mode 100644 index 000000000000..15fd56e57469 --- /dev/null +++ b/hr_expense_analytic_distribution/i18n/fr.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_analytic_distribution +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-12 02:47+0000\n" +"PO-Revision-Date: 2017-06-12 02:47+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_expense_analytic_distribution +#: model:ir.model.fields,field_description:hr_expense_analytic_distribution.field_hr_expense_analytic_distribution_id +msgid "Analytic distribution" +msgstr "" + +#. module: hr_expense_analytic_distribution +#: model:ir.model,name:hr_expense_analytic_distribution.model_hr_expense +msgid "Expense" +msgstr "Frais" diff --git a/hr_expense_analytic_plans/i18n/hr_expense_analytic_plans.pot b/hr_expense_analytic_distribution/i18n/hr_expense_analytic_plans.pot similarity index 100% rename from hr_expense_analytic_plans/i18n/hr_expense_analytic_plans.pot rename to hr_expense_analytic_distribution/i18n/hr_expense_analytic_plans.pot diff --git a/hr_expense_analytic_plans/i18n/nl.po b/hr_expense_analytic_distribution/i18n/nl.po similarity index 100% rename from hr_expense_analytic_plans/i18n/nl.po rename to hr_expense_analytic_distribution/i18n/nl.po diff --git a/hr_expense_analytic_distribution/i18n/pt_BR.po b/hr_expense_analytic_distribution/i18n/pt_BR.po new file mode 100644 index 000000000000..fd756595b32e --- /dev/null +++ b/hr_expense_analytic_distribution/i18n/pt_BR.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_analytic_distribution +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-12 02:47+0000\n" +"PO-Revision-Date: 2017-06-12 02:47+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_expense_analytic_distribution +#: model:ir.model.fields,field_description:hr_expense_analytic_distribution.field_hr_expense_analytic_distribution_id +msgid "Analytic distribution" +msgstr "" + +#. module: hr_expense_analytic_distribution +#: model:ir.model,name:hr_expense_analytic_distribution.model_hr_expense +msgid "Expense" +msgstr "Despesa" diff --git a/hr_expense_analytic_distribution/i18n/sl.po b/hr_expense_analytic_distribution/i18n/sl.po new file mode 100644 index 000000000000..0a0c8eb2f7ae --- /dev/null +++ b/hr_expense_analytic_distribution/i18n/sl.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_analytic_distribution +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-12 02:47+0000\n" +"PO-Revision-Date: 2017-06-12 02:47+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: hr_expense_analytic_distribution +#: model:ir.model.fields,field_description:hr_expense_analytic_distribution.field_hr_expense_analytic_distribution_id +msgid "Analytic distribution" +msgstr "" + +#. module: hr_expense_analytic_distribution +#: model:ir.model,name:hr_expense_analytic_distribution.model_hr_expense +msgid "Expense" +msgstr "Izdatki" diff --git a/hr_expense_analytic_distribution/models/__init__.py b/hr_expense_analytic_distribution/models/__init__.py new file mode 100644 index 000000000000..8f5e884c3a24 --- /dev/null +++ b/hr_expense_analytic_distribution/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Therp BV . +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import hr_expense diff --git a/hr_expense_analytic_distribution/models/hr_expense.py b/hr_expense_analytic_distribution/models/hr_expense.py new file mode 100644 index 000000000000..8b117b5c418c --- /dev/null +++ b/hr_expense_analytic_distribution/models/hr_expense.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Therp BV . +# Copyright 2017 Vicent Cubells - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, fields, models + + +class HrExpense(models.Model): + _inherit = 'hr.expense' + + analytic_distribution_id = fields.Many2one( + comodel_name='account.analytic.distribution', + string='Analytic distribution', + oldname='analytics_id', + states={'post': [('readonly', True)], 'done': [('readonly', True)]}, + ) + + @api.model + def _prepare_move_line(self, line): + result = super(HrExpense, self)._prepare_move_line(line) + result['analytic_distribution_id'] = self.analytic_distribution_id.id + return result diff --git a/hr_expense_analytic_distribution/static/description/icon.png b/hr_expense_analytic_distribution/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/hr_expense_analytic_distribution/static/description/icon.png differ diff --git a/hr_expense_analytic_distribution/tests/__init__.py b/hr_expense_analytic_distribution/tests/__init__.py new file mode 100644 index 000000000000..6f29c6e82ed6 --- /dev/null +++ b/hr_expense_analytic_distribution/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Therp BV . +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import test_hr_expense_analytic_distribution diff --git a/hr_expense_analytic_distribution/tests/test_hr_expense_analytic_distribution.py b/hr_expense_analytic_distribution/tests/test_hr_expense_analytic_distribution.py new file mode 100644 index 000000000000..0046398e0160 --- /dev/null +++ b/hr_expense_analytic_distribution/tests/test_hr_expense_analytic_distribution.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Therp BV . +# Copyright 2017 Vicent Cubells - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests import common + + +class TestHrExpenseAnalyticDistribution(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestHrExpenseAnalyticDistribution, cls).setUpClass() + cls.product = cls.env['product.product'].create({ + 'name': 'Test product', + }) + cls.account1 = cls.env['account.analytic.account'].create({ + 'name': 'account1', + }) + cls.account2 = cls.env['account.analytic.account'].create({ + 'name': 'account2', + }) + cls.instance = cls.env['account.analytic.distribution'].create({ + 'name': 'plan', + 'rule_ids': [ + (0, 0, { + 'percent': 50.0, + 'analytic_account_id': cls.account1.id, + }), + (0, 0, { + 'percent': 50.0, + 'analytic_account_id': cls.account2.id, + }), + ], + }) + cls.sheet = cls.env['hr.expense.sheet'].create({ + 'name': 'Test expense sheet', + }) + cls.expense = cls.env['hr.expense'].create({ + 'name': 'Test expense', + 'analytic_distribution_id': cls.instance.id, + 'product_id': cls.product.id, + 'product_uom_id': + cls.env.ref('product.product_uom_unit').id, + 'unit_amount': 42, + 'quantity': 1, + }) + + def test_hr_expense_analytic_distribution(self): + # Expense has been submitted + self.expense.submit_expenses() + # We add an expense to sheet + self.sheet.expense_line_ids = [(6, 0, [self.expense.id])] + self.assertEqual(len(self.sheet.expense_line_ids), 1) + # Expense is approved + self.sheet.approve_expense_sheets() + # Post entries are created + self.sheet.action_sheet_move_create() + for line in self.sheet.account_move_id.line_ids: + if line.analytic_line_ids: + self.assertEqual(len(line.analytic_line_ids), 2) + self.assertIn(self.account1, [ + l.account_id for l in line.analytic_line_ids]) + self.assertIn(self.account2, [ + l.account_id for l in line.analytic_line_ids]) + for l in line.analytic_line_ids: + if l.move_id.credit: + self.assertAlmostEqual(l.amount, 21) + if l.move_id.debit: + self.assertAlmostEqual(l.amount, -21) diff --git a/hr_expense_analytic_distribution/views/hr_expense.xml b/hr_expense_analytic_distribution/views/hr_expense.xml new file mode 100644 index 000000000000..0991cc5b0d5d --- /dev/null +++ b/hr_expense_analytic_distribution/views/hr_expense.xml @@ -0,0 +1,32 @@ + + + + + hr.expense + + + + + + + + + hr.expense + + + + + + + + + hr.expense.sheet + + + + + + + + + diff --git a/hr_expense_analytic_plans/README.rst b/hr_expense_analytic_plans/README.rst deleted file mode 100644 index ceeb75a95918..000000000000 --- a/hr_expense_analytic_plans/README.rst +++ /dev/null @@ -1,37 +0,0 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License: AGPL-3 -Use analytic plans in expenses -============================== - -This module allows you to assign analytic plans to expense lines instead of analytic accounts. This way, you can distribute the costs of an expense over multiple analytic accounts. - -Bug Tracker -=========== - -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. - -Credits -======= - -Contributors ------------- - -* Holger Brunn - -Maintainer ----------- - -.. image:: https://odoo-community.org/logo.png - :alt: Odoo Community Association - :target: https://odoo-community.org - -This module is maintained by the OCA. - -OCA, or the Odoo Community Association, is a nonprofit organization whose -mission is to support the collaborative development of Odoo features and -promote its widespread use. - -To contribute to this module, please visit http://odoo-community.org. diff --git a/hr_expense_analytic_plans/__init__.py b/hr_expense_analytic_plans/__init__.py deleted file mode 100644 index cdb7d7368e47..000000000000 --- a/hr_expense_analytic_plans/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from . import models diff --git a/hr_expense_analytic_plans/__manifest__.py b/hr_expense_analytic_plans/__manifest__.py deleted file mode 100644 index 5e94abddc789..000000000000 --- a/hr_expense_analytic_plans/__manifest__.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -{ - "name": "Analytic plans in expenses", - "version": "8.0.1.0.0", - "author": "Therp BV,Odoo Community Association (OCA)", - "license": "AGPL-3", - "category": "Human Resources", - "summary": "Use analytic plans in expenses", - "depends": [ - 'hr_expense', - 'account_analytic_plans', - ], - "data": [ - "views/hr_expense.xml", - "views/hr_expense_line.xml", - ], - "auto_install": False, - 'installable': False, - "application": False, - "external_dependencies": { - 'python': [], - }, -} diff --git a/hr_expense_analytic_plans/i18n/de.po b/hr_expense_analytic_plans/i18n/de.po deleted file mode 100644 index c9523ce31eaa..000000000000 --- a/hr_expense_analytic_plans/i18n/de.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_analytic_plans -# -# Translators: -# Thomas A. Jaeger, 2015 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-06 00:27+0000\n" -"PO-Revision-Date: 2015-11-05 14:45+0000\n" -"Last-Translator: Thomas A. Jaeger\n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: hr_expense_analytic_plans -#: field:hr.expense.line,analytics_id:0 -msgid "Analytic plan" -msgstr "Analytischer Plan" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_expense -msgid "Expense" -msgstr "Spesen" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_line -msgid "Expense Line" -msgstr "Spesendetail" diff --git a/hr_expense_analytic_plans/i18n/es.po b/hr_expense_analytic_plans/i18n/es.po deleted file mode 100644 index bbdb66d2262e..000000000000 --- a/hr_expense_analytic_plans/i18n/es.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_analytic_plans -# -# Translators: -# Antonio Trueba, 2016 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-02-10 16:52+0000\n" -"Last-Translator: Antonio Trueba\n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-hr-8-0/language/es/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: hr_expense_analytic_plans -#: field:hr.expense.line,analytics_id:0 -msgid "Analytic plan" -msgstr "Plan analítico" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_expense -msgid "Expense" -msgstr "Gasto" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_line -msgid "Expense Line" -msgstr "Línea de gasto" diff --git a/hr_expense_analytic_plans/i18n/fi.po b/hr_expense_analytic_plans/i18n/fi.po deleted file mode 100644 index a26ac5c3989c..000000000000 --- a/hr_expense_analytic_plans/i18n/fi.po +++ /dev/null @@ -1,33 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_analytic_plans -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-14 04:15+0000\n" -"PO-Revision-Date: 2016-04-04 11:09+0000\n" -"Last-Translator: Jarmo Kortetjärvi \n" -"Language-Team: Finnish (http://www.transifex.com/oca/OCA-hr-8-0/language/fi/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: fi\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: hr_expense_analytic_plans -#: field:hr.expense.line,analytics_id:0 -msgid "Analytic plan" -msgstr "" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_expense -msgid "Expense" -msgstr "Kulu" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_line -msgid "Expense Line" -msgstr "" diff --git a/hr_expense_analytic_plans/i18n/fr.po b/hr_expense_analytic_plans/i18n/fr.po deleted file mode 100644 index 0fe2582a2936..000000000000 --- a/hr_expense_analytic_plans/i18n/fr.po +++ /dev/null @@ -1,33 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_analytic_plans -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2015-07-28 13:32+0000\n" -"Last-Translator: <>\n" -"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. module: hr_expense_analytic_plans -#: field:hr.expense.line,analytics_id:0 -msgid "Analytic plan" -msgstr "" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_expense -msgid "Expense" -msgstr "Frais" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_line -msgid "Expense Line" -msgstr "Ligne de frais" diff --git a/hr_expense_analytic_plans/i18n/pt_BR.po b/hr_expense_analytic_plans/i18n/pt_BR.po deleted file mode 100644 index 0d82bb0f3766..000000000000 --- a/hr_expense_analytic_plans/i18n/pt_BR.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_analytic_plans -# -# Translators: -# danimaribeiro , 2016 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-08 03:18+0000\n" -"Last-Translator: danimaribeiro \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-hr-8-0/language/pt_BR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. module: hr_expense_analytic_plans -#: field:hr.expense.line,analytics_id:0 -msgid "Analytic plan" -msgstr "Plano analítico" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_expense -msgid "Expense" -msgstr "Despesa" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_line -msgid "Expense Line" -msgstr "Linha da despesa" diff --git a/hr_expense_analytic_plans/i18n/sl.po b/hr_expense_analytic_plans/i18n/sl.po deleted file mode 100644 index 8a54b440c2e3..000000000000 --- a/hr_expense_analytic_plans/i18n/sl.po +++ /dev/null @@ -1,34 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_analytic_plans -# -# Translators: -# Matjaž Mozetič , 2015 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-18 13:10+0000\n" -"PO-Revision-Date: 2015-08-01 16:11+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-hr-8-0/language/sl/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" - -#. module: hr_expense_analytic_plans -#: field:hr.expense.line,analytics_id:0 -msgid "Analytic plan" -msgstr "Analitični plan" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_expense -msgid "Expense" -msgstr "Izdatki" - -#. module: hr_expense_analytic_plans -#: model:ir.model,name:hr_expense_analytic_plans.model_hr_expense_line -msgid "Expense Line" -msgstr "Postavka izdatka" diff --git a/hr_expense_analytic_plans/models/__init__.py b/hr_expense_analytic_plans/models/__init__.py deleted file mode 100644 index ec2e858f568f..000000000000 --- a/hr_expense_analytic_plans/models/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from . import hr_expense_line -from . import hr_expense_expense diff --git a/hr_expense_analytic_plans/models/hr_expense_expense.py b/hr_expense_analytic_plans/models/hr_expense_expense.py deleted file mode 100644 index 09681af25fbc..000000000000 --- a/hr_expense_analytic_plans/models/hr_expense_expense.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from openerp import models, api - - -class HrExpenseExpense(models.Model): - _inherit = 'hr.expense.expense' - - @api.model - def move_line_get_item(self, line): - result = super(HrExpenseExpense, self).move_line_get_item(line) - if line.analytics_id: - result['account_analytic_id'] = False - result['analytics_id'] = line.analytics_id.id - return result - - @api.model - def line_get_convert(self, x, part, date): - result = super(HrExpenseExpense, self).line_get_convert(x, part, date) - result['analytics_id'] = x.get('analytics_id', False) - return result diff --git a/hr_expense_analytic_plans/models/hr_expense_line.py b/hr_expense_analytic_plans/models/hr_expense_line.py deleted file mode 100644 index 6f5b5d74085d..000000000000 --- a/hr_expense_analytic_plans/models/hr_expense_line.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from openerp import models, fields - - -class HrExpenseLine(models.Model): - _inherit = 'hr.expense.line' - - analytics_id = fields.Many2one( - 'account.analytic.plan.instance', string='Analytic plan') diff --git a/hr_expense_analytic_plans/tests/__init__.py b/hr_expense_analytic_plans/tests/__init__.py deleted file mode 100644 index d7b709bdb2bb..000000000000 --- a/hr_expense_analytic_plans/tests/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from . import test_hr_expense_analytic_plans diff --git a/hr_expense_analytic_plans/tests/test_hr_expense_analytic_plans.py b/hr_expense_analytic_plans/tests/test_hr_expense_analytic_plans.py deleted file mode 100644 index b20982db12e7..000000000000 --- a/hr_expense_analytic_plans/tests/test_hr_expense_analytic_plans.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from openerp.tests.common import TransactionCase - - -class TestHrExpenseAnalyticPlans(TransactionCase): - def test_hr_expense_analytic_plans(self): - account1 = self.env['account.analytic.account'].create({ - 'name': 'account1', - }) - account2 = self.env['account.analytic.account'].create({ - 'name': 'account2', - }) - instance = self.env['account.analytic.plan.instance'].create({ - 'name': 'plan', - 'account_ids': [ - (0, 0, { - 'rate': 50, - 'analytic_account_id': account1.id, - }), - (0, 0, { - 'rate': 50, - 'analytic_account_id': account2.id, - }), - ], - }) - expense = self.env['hr.expense.expense'].create({ - 'employee_id': self.env.ref('hr.employee_mit').id, - 'name': 'testexpense', - 'line_ids': [ - (0, 0, { - 'name': 'testline', - 'analytics_id': instance.id, - 'unit_amount': 42, - 'unit_quantity': 1, - }), - ], - }) - expense.signal_workflow('confirm') - expense.signal_workflow('validate') - expense.signal_workflow('done') - for line in expense.account_move_id.line_id: - if line.analytic_lines: - self.assertEqual(len(line.analytic_lines), 2) - self.assertIn(account1, [ - l.account_id for l in line.analytic_lines]) - self.assertIn(account2, [ - l.account_id for l in line.analytic_lines]) - for l in line.analytic_lines: - self.assertEqual(l.amount, -21) diff --git a/hr_expense_analytic_plans/views/hr_expense.xml b/hr_expense_analytic_plans/views/hr_expense.xml deleted file mode 100644 index 58165d02d759..000000000000 --- a/hr_expense_analytic_plans/views/hr_expense.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - hr.expense.expense - - - - 1 - - - - - - 1 - - - - - - - - diff --git a/hr_expense_analytic_plans/views/hr_expense_line.xml b/hr_expense_analytic_plans/views/hr_expense_line.xml deleted file mode 100644 index 9e64d6ee6dd2..000000000000 --- a/hr_expense_analytic_plans/views/hr_expense_line.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - hr.expense.line - - - - 1 - - - - - - - - diff --git a/hr_expense_invoice/README.rst b/hr_expense_invoice/README.rst index e8ca941aa71b..619611e09984 100644 --- a/hr_expense_invoice/README.rst +++ b/hr_expense_invoice/README.rst @@ -1,11 +1,13 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License + :target: http://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 +==================================== Set supplier invoices on HR expenses ==================================== This module should be used when a supplier invoice is paid by an employee. It -allows to set a supplier invoice for each expense line, adding the +allows to set a supplier invoice for each expense line, adding the corresponding journal items to transfer the debt to the employee. @@ -22,13 +24,10 @@ You don't need to configure anything more to use this module. Usage ===== -Instead of coding a full expense line, select an existing supplier invoice, -and then the rest of the fields will be auto-filled and grayed. - -When you generate the expenses account entries, lines with invoices filled -will be generated as opposite of the payable move line of the invoice, and -both will be reconciled, letting the employee payable account as the only -open balance. +* Create an expense sheet. +* Add an expense line to sheet with an invoice_id selected or create one new. +* Process expense sheet. +* On paying expense sheet, you are reconciling supplier invoice too. Known issues / Roadmap ====================== @@ -42,7 +41,8 @@ Credits Contributors ------------ -* Pedro M. Baeza +* Pedro M. Baeza +* Vicent Cubells Icon ---- @@ -54,9 +54,9 @@ Icon Maintainer ---------- -.. image:: http://odoo-community.org/logo.png +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. @@ -64,4 +64,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. diff --git a/hr_expense_invoice/__init__.py b/hr_expense_invoice/__init__.py index 49d04adebdea..ec50cfc0f30e 100644 --- a/hr_expense_invoice/__init__.py +++ b/hr_expense_invoice/__init__.py @@ -1,5 +1,4 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + from . import models diff --git a/hr_expense_invoice/__manifest__.py b/hr_expense_invoice/__manifest__.py index 730d94d96b9e..e1bbd78aa1f3 100644 --- a/hr_expense_invoice/__manifest__.py +++ b/hr_expense_invoice/__manifest__.py @@ -1,36 +1,21 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Copyright (c) 2015 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) -# Pedro M. Baeza -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# Copyright 2015 Pedro M. Baeza +# Copyright 2017 Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Supplier invoices on HR expenses', - 'version': '8.0.1.0.0', - 'category': 'HR', - 'author': 'Serv. Tecnol. Avanzados - Pedro M. Baeza, ' + 'version': '10.0.1.0.0', + 'category': 'Human Resources', + 'author': 'Tecnativa, ' 'Odoo Community Association (OCA)', - 'website': 'http://www.serviciosbaeza.com', + 'license': 'AGPL-3', + 'website': 'https://www.tecnativa.com', 'depends': [ 'hr_expense', ], 'data': [ - 'views/hr_expense_expense_view.xml', + 'views/hr_expense_views.xml', ], - 'installable': False, + 'installable': True, } diff --git a/hr_expense_invoice/i18n/de.po b/hr_expense_invoice/i18n/de.po deleted file mode 100644 index 77e7b0ed3001..000000000000 --- a/hr_expense_invoice/i18n/de.po +++ /dev/null @@ -1,49 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_invoice -# -# Translators: -# Rudolf Schnapka , 2016 -# Thomas A. Jaeger, 2015 -# Thomas A. Jaeger, 2015 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-01-26 09:44+0000\n" -"Last-Translator: Rudolf Schnapka \n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 -#, python-format -msgid "" -"Cannot reconcile supplier invoice payable with generated line. Please check " -"amounts and see if the invoice is already added or paid. Invoice: %s" -msgstr "Die erstellte Zeile kann nicht mit der Lieferantenrechnung ausgeglichen werden. Prüfen Sie, ob die Rechnung bereits hinzugefügt oder bezahlt ist. Rechnung: %s" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_expense -msgid "Expense" -msgstr "Aufwand" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_line -msgid "Expense Line" -msgstr "Spesendetail" - -#. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 -msgid "Invoice" -msgstr "Rechnung" - -#. module: hr_expense_invoice -#: view:hr.expense.expense:hr_expense_invoice.view_expenses_form_invoice -msgid "{'readonly': [('invoice', '!=', False)]}" -msgstr "{'readonly': [('invoice', '!=', False)]}" diff --git a/hr_expense_invoice/i18n/es.po b/hr_expense_invoice/i18n/es.po index fd9135a10b14..740e05551aa0 100644 --- a/hr_expense_invoice/i18n/es.po +++ b/hr_expense_invoice/i18n/es.po @@ -1,48 +1,38 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * hr_expense_invoice -# -# Translators: -# Antonio Trueba, 2016 -# Antonio Trueba, 2016 +# * hr_expense_invoice +# msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-02-16 14:59+0000\n" -"Last-Translator: Antonio Trueba\n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-hr-8-0/language/es/)\n" +"POT-Creation-Date: 2017-09-27 16:34+0000\n" +"PO-Revision-Date: 2017-09-27 16:34+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" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: \n" #. module: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 +#: code:addons/hr_expense_invoice/models/hr_expense_sheet.py:35 #, python-format -msgid "" -"Cannot reconcile supplier invoice payable with generated line. Please check " -"amounts and see if the invoice is already added or paid. Invoice: %s" +msgid "Cannot reconcile supplier invoice payable with generated line. Please check amounts and see if the invoice is already added or paid. Invoice: %s" msgstr "No se puede conciliar el saldo a pagar de la factura con la línea generada. Compruebe por favor las cantidades y vea si la factura ya está añadida previamente o pagada. Factura: %s" #. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_expense +#: model:ir.model,name:hr_expense_invoice.model_hr_expense msgid "Expense" msgstr "Gasto" #. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_line -msgid "Expense Line" -msgstr "Línea de gasto" +#: model:ir.model,name:hr_expense_invoice.model_hr_expense_sheet +msgid "Expense Report" +msgstr "Informe de gastos" #. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 +#: model:ir.model.fields,field_description:hr_expense_invoice.field_hr_expense_invoice_id msgid "Invoice" msgstr "Factura" -#. module: hr_expense_invoice -#: view:hr.expense.expense:hr_expense_invoice.view_expenses_form_invoice -msgid "{'readonly': [('invoice', '!=', False)]}" -msgstr "{'readonly': [('invoice', '!=', False)]}" diff --git a/hr_expense_invoice/i18n/fi.po b/hr_expense_invoice/i18n/fi.po deleted file mode 100644 index 7deb8fe47880..000000000000 --- a/hr_expense_invoice/i18n/fi.po +++ /dev/null @@ -1,47 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_invoice -# -# Translators: -# Jarmo Kortetjärvi , 2016 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-14 04:15+0000\n" -"PO-Revision-Date: 2016-04-04 11:09+0000\n" -"Last-Translator: Jarmo Kortetjärvi \n" -"Language-Team: Finnish (http://www.transifex.com/oca/OCA-hr-8-0/language/fi/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: fi\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 -#, python-format -msgid "" -"Cannot reconcile supplier invoice payable with generated line. Please check " -"amounts and see if the invoice is already added or paid. Invoice: %s" -msgstr "" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_expense -msgid "Expense" -msgstr "Kulu" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_line -msgid "Expense Line" -msgstr "" - -#. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 -msgid "Invoice" -msgstr "Lasku" - -#. module: hr_expense_invoice -#: view:hr.expense.expense:hr_expense_invoice.view_expenses_form_invoice -msgid "{'readonly': [('invoice', '!=', False)]}" -msgstr "" diff --git a/hr_expense_invoice/i18n/fr.po b/hr_expense_invoice/i18n/fr.po index ee1946481f97..51c7813f9625 100644 --- a/hr_expense_invoice/i18n/fr.po +++ b/hr_expense_invoice/i18n/fr.po @@ -3,15 +3,15 @@ # * hr_expense_invoice # # Translators: -# Mohamed HABOU , 2016 +# guillaume bauer , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-01-11 17:13+0000\n" -"Last-Translator: Mohamed HABOU \n" -"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: guillaume bauer , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 +#: code:addons/hr_expense_invoice/models/hr_expense_sheet.py:37 #, python-format msgid "" "Cannot reconcile supplier invoice payable with generated line. Please check " @@ -27,21 +27,16 @@ msgid "" msgstr "" #. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_expense +#: model:ir.model,name:hr_expense_invoice.model_hr_expense msgid "Expense" -msgstr "Frais" +msgstr "" #. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_line -msgid "Expense Line" -msgstr "Ligne de frais" +#: model:ir.model,name:hr_expense_invoice.model_hr_expense_sheet +msgid "Expense Report" +msgstr "Rapport de dépenses" #. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 +#: model:ir.model.fields,field_description:hr_expense_invoice.field_hr_expense_invoice_id msgid "Invoice" -msgstr "Facture" - -#. module: hr_expense_invoice -#: view:hr.expense.expense:hr_expense_invoice.view_expenses_form_invoice -msgid "{'readonly': [('invoice', '!=', False)]}" msgstr "" diff --git a/hr_expense_invoice/i18n/hr.po b/hr_expense_invoice/i18n/hr.po new file mode 100644 index 000000000000..76faf1f95860 --- /dev/null +++ b/hr_expense_invoice/i18n/hr.po @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_invoice +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_expense_invoice +#: code:addons/hr_expense_invoice/models/hr_expense_sheet.py:37 +#, python-format +msgid "" +"Cannot reconcile supplier invoice payable with generated line. Please check " +"amounts and see if the invoice is already added or paid. Invoice: %s" +msgstr "" + +#. module: hr_expense_invoice +#: model:ir.model,name:hr_expense_invoice.model_hr_expense +msgid "Expense" +msgstr "" + +#. module: hr_expense_invoice +#: model:ir.model,name:hr_expense_invoice.model_hr_expense_sheet +msgid "Expense Report" +msgstr "Izvještaj troškova" + +#. module: hr_expense_invoice +#: model:ir.model.fields,field_description:hr_expense_invoice.field_hr_expense_invoice_id +msgid "Invoice" +msgstr "" diff --git a/hr_expense_invoice/i18n/hr_expense_invoice.pot b/hr_expense_invoice/i18n/hr_expense_invoice.pot deleted file mode 100644 index ca5cec654952..000000000000 --- a/hr_expense_invoice/i18n/hr_expense_invoice.pot +++ /dev/null @@ -1,27 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_invoice -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 20:07+0000\n" -"PO-Revision-Date: 2015-03-09 20:07+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: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 -#, python-format -msgid "Cannot reconcile supplier invoice payable with generated line. Please check amounts and see if the invoice is already added or paid. Invoice: %s" -msgstr "" - -#. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 -msgid "Invoice" -msgstr "" diff --git a/hr_expense_invoice/i18n/it.po b/hr_expense_invoice/i18n/it.po deleted file mode 100644 index 3ddf3b0735d4..000000000000 --- a/hr_expense_invoice/i18n/it.po +++ /dev/null @@ -1,47 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_invoice -# -# Translators: -# Paolo Valier, 2016 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-12 12:02+0000\n" -"PO-Revision-Date: 2016-03-19 10:40+0000\n" -"Last-Translator: Paolo Valier\n" -"Language-Team: Italian (http://www.transifex.com/oca/OCA-hr-8-0/language/it/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 -#, python-format -msgid "" -"Cannot reconcile supplier invoice payable with generated line. Please check " -"amounts and see if the invoice is already added or paid. Invoice: %s" -msgstr "" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_expense -msgid "Expense" -msgstr "" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_line -msgid "Expense Line" -msgstr "" - -#. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 -msgid "Invoice" -msgstr "Fattura" - -#. module: hr_expense_invoice -#: view:hr.expense.expense:hr_expense_invoice.view_expenses_form_invoice -msgid "{'readonly': [('invoice', '!=', False)]}" -msgstr "" diff --git a/hr_expense_invoice/i18n/nl_NL.po b/hr_expense_invoice/i18n/nl_NL.po new file mode 100644 index 000000000000..73f635e7938c --- /dev/null +++ b/hr_expense_invoice/i18n/nl_NL.po @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_invoice +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_expense_invoice +#: code:addons/hr_expense_invoice/models/hr_expense_sheet.py:37 +#, python-format +msgid "" +"Cannot reconcile supplier invoice payable with generated line. Please check " +"amounts and see if the invoice is already added or paid. Invoice: %s" +msgstr "" + +#. module: hr_expense_invoice +#: model:ir.model,name:hr_expense_invoice.model_hr_expense +msgid "Expense" +msgstr "" + +#. module: hr_expense_invoice +#: model:ir.model,name:hr_expense_invoice.model_hr_expense_sheet +msgid "Expense Report" +msgstr "Onkostennota" + +#. module: hr_expense_invoice +#: model:ir.model.fields,field_description:hr_expense_invoice.field_hr_expense_invoice_id +msgid "Invoice" +msgstr "" diff --git a/hr_expense_invoice/i18n/pt_BR.po b/hr_expense_invoice/i18n/pt_BR.po deleted file mode 100644 index 2b890fe7b994..000000000000 --- a/hr_expense_invoice/i18n/pt_BR.po +++ /dev/null @@ -1,47 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_invoice -# -# Translators: -# danimaribeiro , 2016 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-08 03:18+0000\n" -"Last-Translator: danimaribeiro \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-hr-8-0/language/pt_BR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. module: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 -#, python-format -msgid "" -"Cannot reconcile supplier invoice payable with generated line. Please check " -"amounts and see if the invoice is already added or paid. Invoice: %s" -msgstr "" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_expense -msgid "Expense" -msgstr "Despesa" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_line -msgid "Expense Line" -msgstr "Linha da despesa" - -#. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 -msgid "Invoice" -msgstr "Fatura" - -#. module: hr_expense_invoice -#: view:hr.expense.expense:hr_expense_invoice.view_expenses_form_invoice -msgid "{'readonly': [('invoice', '!=', False)]}" -msgstr "" diff --git a/hr_expense_invoice/i18n/sl.po b/hr_expense_invoice/i18n/sl.po deleted file mode 100644 index a8f656a5dd5c..000000000000 --- a/hr_expense_invoice/i18n/sl.po +++ /dev/null @@ -1,47 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * hr_expense_invoice -# -# Translators: -# Matjaž Mozetič , 2015 -msgid "" -msgstr "" -"Project-Id-Version: hr (8.0)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-18 13:10+0000\n" -"PO-Revision-Date: 2015-08-01 16:12+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-hr-8-0/language/sl/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" - -#. module: hr_expense_invoice -#: code:addons/hr_expense_invoice/models/hr_expense_expense.py:49 -#, python-format -msgid "" -"Cannot reconcile supplier invoice payable with generated line. Please check " -"amounts and see if the invoice is already added or paid. Invoice: %s" -msgstr "Ni mogoče uskladiti konta prejetih računov z ustvarjeno postavko. Preverite zneske in poglejte, če je račun že dodan ali plačan. Račun: %s" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_expense -msgid "Expense" -msgstr "Izdatki" - -#. module: hr_expense_invoice -#: model:ir.model,name:hr_expense_invoice.model_hr_expense_line -msgid "Expense Line" -msgstr "Postavka izdatka" - -#. module: hr_expense_invoice -#: field:hr.expense.line,invoice:0 -msgid "Invoice" -msgstr "Račun" - -#. module: hr_expense_invoice -#: view:hr.expense.expense:hr_expense_invoice.view_expenses_form_invoice -msgid "{'readonly': [('invoice', '!=', False)]}" -msgstr "{'readonly': [('invoice', '!=', False)]}" diff --git a/hr_expense_invoice/models/__init__.py b/hr_expense_invoice/models/__init__.py index 5bd402a996d5..8b7d1125ee50 100644 --- a/hr_expense_invoice/models/__init__.py +++ b/hr_expense_invoice/models/__init__.py @@ -1,5 +1,5 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## -from . import hr_expense_expense +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import hr_expense +from . import hr_expense_sheet diff --git a/hr_expense_invoice/models/hr_expense.py b/hr_expense_invoice/models/hr_expense.py new file mode 100644 index 000000000000..3d5f4da8212f --- /dev/null +++ b/hr_expense_invoice/models/hr_expense.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Pedro M. Baeza +# Copyright 2017 Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class HrExpense(models.Model): + _inherit = 'hr.expense' + + invoice_id = fields.Many2one( + comodel_name="account.invoice", + string='Invoice', + domain="[('type', '=', 'in_invoice'), ('state', '=', 'open')]", + oldname='invoice', + ) + + @api.onchange('invoice_id') + def onchange_invoice_id(self): + self.date = self.invoice_id.date_invoice + self.name = self.invoice_id.number + self.reference = self.invoice_id.number or self.invoice_id.reference + self.analytic_account_id = False + self.unit_amount = self.invoice_id.residual + self.quantity = 1.0 + self.total_amount = self.unit_amount + + def _check_vals(self, vals): + if vals.get('invoice_id'): + # Rewrite values because readonly fields are not stored + invoice = self.env['account.invoice'].browse(vals['invoice_id']) + vals['date'] = invoice.date_invoice + vals['analytic_account_id'] = False + vals['unit_amount'] = invoice.residual + vals['total_amount'] = invoice.residual + vals['quantity'] = 1.0 + + @api.model + def create(self, vals): + self._check_vals(vals) + return super(HrExpense, self).create(vals) + + @api.multi + def write(self, vals): + self._check_vals(vals) + return super(HrExpense, self).write(vals) + + def _prepare_move_line(self, line): + expense = super(HrExpense, self)._prepare_move_line(line) + if self.invoice_id and expense['debit']: + expense['partner_id'] = \ + self.invoice_id.partner_id.commercial_partner_id.id + expense['account_id'] = self.invoice_id.account_id.id + return expense diff --git a/hr_expense_invoice/models/hr_expense_expense.py b/hr_expense_invoice/models/hr_expense_expense.py deleted file mode 100644 index 40b5bbff2076..000000000000 --- a/hr_expense_invoice/models/hr_expense_expense.py +++ /dev/null @@ -1,103 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## - -from openerp import models, fields, api, exceptions, _ - - -class HrExpenseExpense(models.Model): - _inherit = 'hr.expense.expense' - - @api.model - def line_get_convert(self, x, part, date): - res = super(HrExpenseExpense, self).line_get_convert(x, part, date) - if x.get('invoice'): - res['partner_id'] = ( - x['invoice'].partner_id.commercial_partner_id.id) - return res - - @api.model - def move_line_get_item(self, line): - if line.invoice: - return { - 'account_id': line.invoice.account_id.id, - 'name': line.name, - 'price': line.total_amount, - 'invoice': line.invoice, - } - else: - return super(HrExpenseExpense, self).move_line_get_item(line) - - @api.multi - def action_move_create(self): - """Reconcile supplier invoice payables with the created move lines.""" - res = super(HrExpenseExpense, self).action_move_create() - for expense in self: - for line in expense.line_ids: - if line.invoice: - partner = line.invoice.partner_id.commercial_partner_id - move_lines = expense.account_move_id.line_id - c_move_lines = move_lines.filtered( - lambda x: x.partner_id == partner and - x.debit == line.invoice.residual) - c_move_lines |= line.invoice.move_id.line_id.filtered( - lambda x: x.account_id == line.invoice.account_id and - x.credit == line.invoice.residual) - if len(c_move_lines) != 2: - raise exceptions.Warning( - _('Cannot reconcile supplier invoice payable with ' - 'generated line. Please check amounts and see ' - 'if the invoice is already added or paid. ' - 'Invoice: %s') % line.invoice.name) - c_move_lines.reconcile() - return res - - @api.multi - def copy(self, default=None): - res = super(HrExpenseExpense, self).copy(default) - # Erase invoice references - res.line_ids.write({'invoice': False}) - return res - - -class HrExpenseLine(models.Model): - _inherit = 'hr.expense.line' - - invoice = fields.Many2one( - comodel_name="account.invoice", - domain="[('type', '=', 'in_invoice'), ('state', '=', 'open')]") - - @api.one - @api.onchange('invoice') - def onchange_invoice(self): - """Show in screen invoice data""" - self.product_id = False - self.date_value = self.invoice.date_invoice - self.name = self.invoice.number - self.ref = (self.invoice.supplier_invoice_number or - self.invoice.reference) - self.analytic_account = False - self.unit_amount = self.invoice.residual - self.unit_quantity = 1 - self.total_amount = self.unit_amount - - def _check_vals(self, vals): - if vals.get('invoice'): - # Rewrite values because readonly fields are not stored - invoice = self.env['account.invoice'].browse(vals['invoice']) - vals['product_id'] = False - vals['date_value'] = invoice.date_invoice - vals['analytic_account'] = False - vals['unit_amount'] = invoice.residual - vals['unit_quantity'] = 1 - - @api.model - def create(self, vals): - self._check_vals(vals) - return super(HrExpenseLine, self).create(vals) - - @api.multi - def write(self, vals): - self._check_vals(vals) - return super(HrExpenseLine, self).write(vals) diff --git a/hr_expense_invoice/models/hr_expense_sheet.py b/hr_expense_invoice/models/hr_expense_sheet.py new file mode 100644 index 000000000000..090ed829e752 --- /dev/null +++ b/hr_expense_invoice/models/hr_expense_sheet.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Pedro M. Baeza +# Copyright 2017 Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _, api, exceptions, models + + +class HrExpenseSheet(models.Model): + _inherit = "hr.expense.sheet" + + @api.multi + def action_sheet_move_create(self): + expense_line_ids = self.mapped('expense_line_ids').filtered( + lambda r: r.invoice_id, + ) + res = super(HrExpenseSheet, self).action_sheet_move_create() + move_lines = self.env['account.move'].search( + [('ref', 'in', self.mapped('name'))], + ).mapped('line_ids') + for line in expense_line_ids: + partner = line.invoice_id.partner_id.commercial_partner_id + c_move_lines = move_lines.filtered( + lambda x: + x.partner_id == partner and + x.debit == line.invoice_id.residual and + not x.reconciled + ) + if len(c_move_lines) > 1: + c_move_lines = c_move_lines[0] + c_move_lines |= line.invoice_id.move_id.line_ids.filtered( + lambda x: + x.account_id == line.invoice_id.account_id and + x.credit == line.invoice_id.residual) + if len(c_move_lines) != 2: + raise exceptions.Warning( + _('Cannot reconcile supplier invoice payable with ' + 'generated line. Please check amounts and see ' + 'if the invoice is already added or paid. ' + 'Invoice: %s') % line.invoice.name) + c_move_lines.reconcile() + return res diff --git a/hr_expense_invoice/static/description/icon.svg b/hr_expense_invoice/static/description/icon.svg deleted file mode 100644 index 6394231803e8..000000000000 --- a/hr_expense_invoice/static/description/icon.svg +++ /dev/null @@ -1,428 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hr_expense_invoice/tests/__init__.py b/hr_expense_invoice/tests/__init__.py new file mode 100644 index 000000000000..d9a7c87e073f --- /dev/null +++ b/hr_expense_invoice/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_hr_expense_invoice diff --git a/hr_expense_invoice/tests/test_hr_expense_invoice.py b/hr_expense_invoice/tests/test_hr_expense_invoice.py new file mode 100644 index 000000000000..2b835b9094de --- /dev/null +++ b/hr_expense_invoice/tests/test_hr_expense_invoice.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Vicent Cubells - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests import common + + +class TestHrExpenseInvoice(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestHrExpenseInvoice, cls).setUpClass() + + partner = cls.env['res.partner'].create({ + 'name': 'Test partner', + 'supplier': True, + }) + receivable = cls.env.ref('account.data_account_type_receivable').id + expenses = cls.env.ref('account.data_account_type_expenses').id + invoice_account = cls.env['account.account'].search( + [('user_type_id', '=', receivable)], limit=1).id + invoice_line_account = cls.env['account.account'].search( + [('user_type_id', '=', expenses)], limit=1).id + product = cls.env['product.product'].create({ + 'name': 'Product test', + 'type': 'service', + }) + cls.invoice = cls.env['account.invoice'].create({ + 'partner_id': partner.id, + 'account_id': invoice_account, + 'type': 'in_invoice', + 'invoice_line_ids': [(0, 0, { + 'product_id': product.id, + 'quantity': 1.0, + 'price_unit': 100.0, + 'name': 'product that cost 100', + 'account_id': invoice_line_account, + })] + }) + cls.sheet = cls.env['hr.expense.sheet'].create({ + 'name': 'Test expense sheet', + }) + cls.expense = cls.env['hr.expense'].create({ + 'name': 'Expense test', + 'product_id': product.id, + 'unit_amount': 0.0, + }) + + def test_hr_test_invoice(self): + # There is not expense lines in sheet + self.assertEqual(len(self.sheet.expense_line_ids), 0) + # We add an expense + self.sheet.expense_line_ids = [(6, 0, [self.expense.id])] + self.assertEqual(len(self.sheet.expense_line_ids), 1) + # We add invoice to expense + self.invoice.action_invoice_open() + self.expense.invoice_id = self.invoice.id + self.expense.onchange_invoice_id() + self.assertAlmostEqual(self.expense.total_amount, 100.0) + # We approve sheet + self.sheet.approve_expense_sheets() + self.assertEqual(self.sheet.state, 'approve') + self.assertFalse(self.sheet.account_move_id) + self.assertEqual(self.invoice.state, 'open') + # We posrt journal entries + self.sheet.action_sheet_move_create() + self.assertEqual(self.sheet.state, 'post') + self.assertTrue(self.sheet.account_move_id) + # Invoice is now paid + self.assertEqual(self.invoice.state, 'paid') diff --git a/hr_expense_invoice/views/hr_expense_expense_view.xml b/hr_expense_invoice/views/hr_expense_expense_view.xml deleted file mode 100644 index c21ba5dd02f2..000000000000 --- a/hr_expense_invoice/views/hr_expense_expense_view.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - hr.expense.form.invoice - hr.expense.expense - - - - - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - {'readonly': [('invoice', '!=', False)]} - - - - - - diff --git a/hr_expense_invoice/views/hr_expense_views.xml b/hr_expense_invoice/views/hr_expense_views.xml new file mode 100644 index 000000000000..dedb7f734a63 --- /dev/null +++ b/hr_expense_invoice/views/hr_expense_views.xml @@ -0,0 +1,33 @@ + + + + + hr.expense.form + hr.expense + + + + + + + {'readonly': [('invoice_id', '!=', False)]} + + + {'readonly': [('invoice_id', '!=', False)]} + + + {'readonly': [('invoice_id', '!=', False)]} + + + {'readonly': [('invoice_id', '!=', False)]} + + + {'readonly': [('invoice_id', '!=', False)]} + + + {'readonly': [('invoice_id', '!=', False)]} + + + + + diff --git a/hr_expense_sequence/i18n/fr.po b/hr_expense_sequence/i18n/fr.po index 6739fa4f4123..4387dcca320a 100644 --- a/hr_expense_sequence/i18n/fr.po +++ b/hr_expense_sequence/i18n/fr.po @@ -3,14 +3,15 @@ # * hr_expense_sequence # # Translators: +# guillaume bauer , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-18 13:10+0000\n" -"PO-Revision-Date: 2015-07-27 23:44+0000\n" -"Last-Translator: <>\n" -"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" +"POT-Creation-Date: 2017-07-17 12:55+0000\n" +"PO-Revision-Date: 2017-07-17 12:55+0000\n" +"Last-Translator: guillaume bauer , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,17 +19,16 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_expense_sequence -#: view:hr.expense.expense:hr_expense_sequence.view_expenses_form_sequence -#: model:ir.model,name:hr_expense_sequence.model_hr_expense_expense -msgid "Expense" -msgstr "Frais" +#: model:ir.model,name:hr_expense_sequence.model_hr_expense_sheet +msgid "Expense Report" +msgstr "Rapport de dépenses" #. module: hr_expense_sequence -#: field:hr.expense.expense,number:0 -msgid "Number" -msgstr "" +#: model:ir.ui.view,arch_db:hr_expense_sequence.report_expense_sheet +msgid "Expenses Report" +msgstr "Rapport de dépenses" #. module: hr_expense_sequence -#: view:hr.expense.expense:hr_expense_sequence.view_hr_expense_filter_sequence -msgid "['|', ('name', 'ilike', self), ('number', 'ilike', self)]" -msgstr "" +#: model:ir.model.fields,field_description:hr_expense_sequence.field_hr_expense_sheet_number +msgid "Number" +msgstr "Nombre" diff --git a/hr_expense_sequence/i18n/hr.po b/hr_expense_sequence/i18n/hr.po new file mode 100644 index 000000000000..e6d16209d21a --- /dev/null +++ b/hr_expense_sequence/i18n/hr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_sequence +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_expense_sequence +#: model:ir.model,name:hr_expense_sequence.model_hr_expense_sheet +msgid "Expense Report" +msgstr "Izvještaj troškova" + +#. module: hr_expense_sequence +#: model:ir.ui.view,arch_db:hr_expense_sequence.report_expense_sheet +msgid "Expenses Report" +msgstr "Izvještaji troškova" + +#. module: hr_expense_sequence +#: model:ir.model.fields,field_description:hr_expense_sequence.field_hr_expense_sheet_number +msgid "Number" +msgstr "Broj" diff --git a/hr_experience/i18n/de.po b/hr_experience/i18n/de.po index 45b06a09c1f3..df867e16cbba 100644 --- a/hr_experience/i18n/de.po +++ b/hr_experience/i18n/de.po @@ -3,15 +3,15 @@ # * hr_experience # # Translators: -# Niki Waibel , 2017 # OCA Transbot , 2017 +# Niki Waibel , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: Niki Waibel , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -289,7 +289,7 @@ msgstr "" #: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_name #: model:ir.model.fields,field_description:hr_experience.field_hr_experience_name msgid "Name" -msgstr "Bezeichnung" +msgstr "Name" #. module: hr_experience #: model:ir.model.fields,field_description:hr_experience.field_hr_academic_partner_id diff --git a/hr_experience/i18n/es.po b/hr_experience/i18n/es.po index ddae935b56f6..6d50c637b515 100644 --- a/hr_experience/i18n/es.po +++ b/hr_experience/i18n/es.po @@ -4,13 +4,14 @@ # # Translators: # OCA Transbot , 2017 +# José Antonio Cuello , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: José Antonio Cuello , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -268,7 +269,7 @@ msgstr "Última actualización por" #: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_write_date #: model:ir.model.fields,field_description:hr_experience.field_hr_experience_write_date msgid "Last Updated on" -msgstr "Última actualización en" +msgstr "Última actualización el" #. module: hr_experience #: model:ir.model.fields,field_description:hr_experience.field_hr_academic_location diff --git a/hr_experience/i18n/hr.po b/hr_experience/i18n/hr.po new file mode 100644 index 000000000000..487a5cde02e9 --- /dev/null +++ b/hr_experience/i18n/hr.po @@ -0,0 +1,367 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_experience +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_employee_experience_ids +msgid " Professional Experiences" +msgstr "Profesionalno iskustvo" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_certification_tree +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "# Certificate" +msgstr "# Ceritfikat" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "# Certification" +msgstr "# Certificiranje" + +#. module: hr_experience +#: selection:hr.experience,category:0 +msgid "Academic" +msgstr "Akademski" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Academic Experience" +msgstr "Akademsko iskustvo" + +#. module: hr_experience +#: model:ir.ui.menu,name:hr_experience.menu_open_view_academic_form +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Academic Experiences" +msgstr "Akademska iskustva" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_academic_form +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Academic Information" +msgstr "Akademske informacije" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_academic_form +msgid "Academic experience" +msgstr "Akademsko iskustvo" + +#. module: hr_experience +#: model:ir.actions.act_window,name:hr_experience.open_view_academic_form +#: model:ir.model.fields,field_description:hr_experience.field_hr_employee_academic_ids +#: model:ir.model.fields,help:hr_experience.field_hr_employee_academic_ids +#: model:ir.ui.view,arch_db:hr_experience.view_academic_tree +msgid "Academic experiences" +msgstr "Akademska iskustva" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_activities +msgid "Activities and associations" +msgstr "Aktivnosti i asocijacije" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_academic_form +msgid "Additional Information" +msgstr "Dodatne informacije" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_category +#: model:ir.model.fields,help:hr_experience.field_hr_experience_category +msgid "Category" +msgstr "Kategorija" + +#. module: hr_experience +#: selection:hr.experience,category:0 +#: model:ir.ui.view,arch_db:hr_experience.view_certification_form +#: model:ir.ui.view,arch_db:hr_experience.view_certification_tree +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Certification" +msgstr "Certificiranje" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_certification +#: model:ir.model.fields,help:hr_experience.field_hr_certification_certification +msgid "Certification Number" +msgstr "Broj certifikata" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_certification_form +msgid "Certification information" +msgstr "Informacije o certifikatu" + +#. module: hr_experience +#: model:ir.actions.act_window,name:hr_experience.open_view_certification_form +#: model:ir.model.fields,field_description:hr_experience.field_hr_employee_certification_ids +#: model:ir.model.fields,help:hr_experience.field_hr_employee_certification_ids +#: model:ir.ui.menu,name:hr_experience.menu_open_view_certification_form +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Certifications" +msgstr "Certifikati" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_create_uid +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_create_uid +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_create_uid +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_create_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_create_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_create_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_academic_form +#: model:ir.ui.view,arch_db:hr_experience.view_certification_form +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +#: model:ir.ui.view,arch_db:hr_experience.view_professional_form +msgid "Dates" +msgstr "Datumi" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_description +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_description +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_description +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_description +#: model:ir.ui.view,arch_db:hr_experience.view_certification_form +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +#: model:ir.ui.view,arch_db:hr_experience.view_professional_form +msgid "Description" +msgstr "Opis" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_diploma +msgid "Diploma" +msgstr "Diploma" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_display_name +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_display_name +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_display_name +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_academic_tree +msgid "Education" +msgstr "Obrazovanje" + +#. module: hr_experience +#: model:ir.model,name:hr_experience.model_hr_employee +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_employee_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_employee_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_employee_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_employee_id +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_experience +#: model:ir.model,name:hr_experience.model_hr_curriculum +msgid "Employee's Curriculum" +msgstr "Djelatnikov životopis" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +#: model:ir.ui.view,arch_db:hr_experience.view_professional_form +#: model:ir.ui.view,arch_db:hr_experience.view_professional_tree +msgid "Employer" +msgstr "Djelatnik" + +#. module: hr_experience +#: model:ir.model.fields,help:hr_experience.field_hr_academic_partner_id +#: model:ir.model.fields,help:hr_experience.field_hr_certification_partner_id +#: model:ir.model.fields,help:hr_experience.field_hr_curriculum_partner_id +#: model:ir.model.fields,help:hr_experience.field_hr_experience_partner_id +msgid "Employer, School, University, Certification Authority" +msgstr "Poslodavac, Škola, Fakultet, Ovašteni certifikatori" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_end_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_end_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_end_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_end_date +msgid "End date" +msgstr "Završni datum" + +#. module: hr_experience +#: model:ir.ui.menu,name:hr_experience.menu_hr_experience +msgid "Experiences" +msgstr "Iskustva" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_expire +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_expire +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_expire +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_expire +#: model:ir.model.fields,help:hr_experience.field_hr_academic_expire +#: model:ir.model.fields,help:hr_experience.field_hr_certification_expire +#: model:ir.model.fields,help:hr_experience.field_hr_curriculum_expire +#: model:ir.model.fields,help:hr_experience.field_hr_experience_expire +msgid "Expire" +msgstr "Ističe" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_study_field +msgid "Field of study" +msgstr "Područje obrazovanja" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_id +msgid "ID" +msgstr "ID" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_academic_tree +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Institution" +msgstr "Institucija" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_certification_form +#: model:ir.ui.view,arch_db:hr_experience.view_certification_tree +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Issued By" +msgstr "Izdao" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic___last_update +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification___last_update +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum___last_update +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_write_uid +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_write_uid +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_write_uid +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_write_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_write_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_write_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_location +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_location +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_location +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_location +#: model:ir.model.fields,help:hr_experience.field_hr_academic_location +#: model:ir.model.fields,help:hr_experience.field_hr_certification_location +#: model:ir.model.fields,help:hr_experience.field_hr_curriculum_location +#: model:ir.model.fields,help:hr_experience.field_hr_experience_location +msgid "Location" +msgstr "Lokacija" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_name +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_name +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_name +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_name +msgid "Name" +msgstr "Naziv" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_partner_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_partner_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_partner_id +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_partner_id +#: model:ir.ui.view,arch_db:hr_experience.view_academic_form +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +msgid "Partner" +msgstr "Partner" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_certification_form +#: model:ir.ui.view,arch_db:hr_experience.view_professional_form +msgid "Partner information" +msgstr "POdaci o partneru" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +#: model:ir.ui.view,arch_db:hr_experience.view_professional_form +#: model:ir.ui.view,arch_db:hr_experience.view_professional_tree +msgid "Position" +msgstr "Posicija" + +#. module: hr_experience +#: selection:hr.experience,category:0 +msgid "Professional" +msgstr "Prefesionalno" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +#: model:ir.ui.view,arch_db:hr_experience.view_professional_form +msgid "Professional Experience" +msgstr "Profesionalno iskustvo" + +#. module: hr_experience +#: model:ir.actions.act_window,name:hr_experience.open_view_professional_form +#: model:ir.model.fields,help:hr_experience.field_hr_employee_experience_ids +#: model:ir.ui.menu,name:hr_experience.menu_open_view_professional_form +#: model:ir.ui.view,arch_db:hr_experience.view_employee_form_inherit +#: model:ir.ui.view,arch_db:hr_experience.view_professional_tree +msgid "Professional Experiences" +msgstr "Profesionlna iskustva" + +#. module: hr_experience +#: model:ir.model.fields,field_description:hr_experience.field_hr_academic_start_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_certification_start_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_start_date +#: model:ir.model.fields,field_description:hr_experience.field_hr_experience_start_date +msgid "Start date" +msgstr "Početni datum" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_certification_form +msgid "certification" +msgstr "certificiranje" + +#. module: hr_experience +#: model:ir.ui.view,arch_db:hr_experience.view_certification_tree +msgid "certifications" +msgstr "certificiranja" + +#. module: hr_experience +#: model:ir.model,name:hr_experience.model_hr_academic +msgid "hr.academic" +msgstr "hr.academic" + +#. module: hr_experience +#: model:ir.model,name:hr_experience.model_hr_certification +msgid "hr.certification" +msgstr "hr.certification" + +#. module: hr_experience +#: model:ir.model,name:hr_experience.model_hr_experience +msgid "hr.experience" +msgstr "hr.experience" diff --git a/hr_experience/i18n/sl.po b/hr_experience/i18n/sl.po index 91887c91fed8..2a81fa18223c 100644 --- a/hr_experience/i18n/sl.po +++ b/hr_experience/i18n/sl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" @@ -288,7 +288,7 @@ msgstr "Lokacija" #: model:ir.model.fields,field_description:hr_experience.field_hr_curriculum_name #: model:ir.model.fields,field_description:hr_experience.field_hr_experience_name msgid "Name" -msgstr "Naziv" +msgstr "Ime" #. module: hr_experience #: model:ir.model.fields,field_description:hr_experience.field_hr_academic_partner_id diff --git a/hr_family/i18n/fr.po b/hr_family/i18n/fr.po index af97aae8a0fb..c44cfc2af126 100644 --- a/hr_family/i18n/fr.po +++ b/hr_family/i18n/fr.po @@ -5,13 +5,14 @@ # Translators: # leemannd , 2017 # OCA Transbot , 2017 +# guillaume bauer , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-10 19:09+0000\n" -"PO-Revision-Date: 2017-03-10 19:09+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2017-07-17 12:55+0000\n" +"PO-Revision-Date: 2017-07-17 12:55+0000\n" +"Last-Translator: guillaume bauer , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +55,7 @@ msgstr "Employé" #. module: hr_family #: model:ir.ui.view,arch_db:hr_family.hr_children_view_tree msgid "Employee Children" -msgstr "" +msgstr "Enfants de l'employée" #. module: hr_family #: model:ir.ui.view,arch_db:hr_family.hr_employee_view_form @@ -64,7 +65,7 @@ msgstr "Famille" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_father_date_of_birth msgid "Father Date of Birth" -msgstr "" +msgstr "Date de naissance du père" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_father @@ -84,7 +85,7 @@ msgstr "Sexe" #. module: hr_family #: model:ir.model,name:hr_family.model_hr_employee_children msgid "HR Employee Children" -msgstr "" +msgstr "RH Enfants de l'employé" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_id @@ -114,7 +115,7 @@ msgstr "Masculin" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_mother_date_of_birth msgid "Mother Date of Birth" -msgstr "" +msgstr "Date de naissance de la mère" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_mother @@ -134,19 +135,19 @@ msgstr "Parents" #. module: hr_family #: model:ir.ui.view,arch_db:hr_family.hr_employee_view_form msgid "Spouse" -msgstr "Épouse" +msgstr "Epoux / Epouse" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_spouse msgid "Spouse's Name" -msgstr "" +msgstr "Nom de l'époux" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_spouse_tel msgid "Spouse's Telephone" -msgstr "" +msgstr "Numéro de téléphone de l'époux / épouse" #. module: hr_family #: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_spouse_employer msgid "Spouses's Employer" -msgstr "" +msgstr "Employeur de l'époux / épouse" diff --git a/hr_family/i18n/hr.po b/hr_family/i18n/hr.po new file mode 100644 index 000000000000..9cba5fdf2689 --- /dev/null +++ b/hr_family/i18n/hr.po @@ -0,0 +1,151 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_family +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_children_ids +#: model:ir.ui.view,arch_db:hr_family.hr_employee_view_form +msgid "Children" +msgstr "Djeca" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_date_of_birth +msgid "Date of Birth" +msgstr "Datum rođenja" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_family +#: model:ir.model,name:hr_family.model_hr_employee +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_employee_id +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_family +#: model:ir.ui.view,arch_db:hr_family.hr_children_view_tree +msgid "Employee Children" +msgstr "Djelatnikova djeca" + +#. module: hr_family +#: model:ir.ui.view,arch_db:hr_family.hr_employee_view_form +msgid "Family" +msgstr "Obitelj" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_father_date_of_birth +msgid "Father Date of Birth" +msgstr "Datum rođenja oca" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_father +msgid "Father's Name" +msgstr "Ime oca" + +#. module: hr_family +#: selection:hr.employee.children,gender:0 +msgid "Female" +msgstr "Žensko" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_gender +msgid "Gender" +msgstr "Spol" + +#. module: hr_family +#: model:ir.model,name:hr_family.model_hr_employee_children +msgid "HR Employee Children" +msgstr "Djeca djelatnika" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_id +msgid "ID" +msgstr "ID" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_family +#: selection:hr.employee.children,gender:0 +msgid "Male" +msgstr "Muško" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_mother_date_of_birth +msgid "Mother Date of Birth" +msgstr "Datum rođenja majke" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_mother +msgid "Mother's Name" +msgstr "Majčino ime" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_children_name +msgid "Name" +msgstr "Naziv" + +#. module: hr_family +#: model:ir.ui.view,arch_db:hr_family.hr_employee_view_form +msgid "Parents" +msgstr "Roditelji" + +#. module: hr_family +#: model:ir.ui.view,arch_db:hr_family.hr_employee_view_form +msgid "Spouse" +msgstr "" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_spouse +msgid "Spouse's Name" +msgstr "" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_spouse_tel +msgid "Spouse's Telephone" +msgstr "" + +#. module: hr_family +#: model:ir.model.fields,field_description:hr_family.field_hr_employee_fam_spouse_employer +msgid "Spouses's Employer" +msgstr "" diff --git a/hr_holidays_compute_days/i18n/de.po b/hr_holidays_compute_days/i18n/de.po index 5228e54ee349..c0a23851a838 100644 --- a/hr_holidays_compute_days/i18n/de.po +++ b/hr_holidays_compute_days/i18n/de.po @@ -3,15 +3,15 @@ # * hr_holidays_compute_days # # Translators: -# OCA Transbot , 2016 -# Niki Waibel , 2016 +# Niki Waibel , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-29 01:35+0000\n" -"PO-Revision-Date: 2016-11-29 01:35+0000\n" -"Last-Translator: Niki Waibel , 2016\n" +"POT-Creation-Date: 2017-11-28 01:43+0000\n" +"PO-Revision-Date: 2017-11-28 01:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #. module: hr_holidays_compute_days #: model:ir.model,name:hr_holidays_compute_days.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" #. module: hr_holidays_compute_days #: model:ir.model.fields,field_description:hr_holidays_compute_days.field_hr_holidays_status_exclude_public_holidays diff --git a/hr_holidays_compute_days/i18n/hr.po b/hr_holidays_compute_days/i18n/hr.po new file mode 100644 index 000000000000..70030a84aa45 --- /dev/null +++ b/hr_holidays_compute_days/i18n/hr.po @@ -0,0 +1,74 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_compute_days +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_compute_days +#: model:ir.model,name:hr_holidays_compute_days.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_holidays_compute_days +#: model:ir.model.fields,field_description:hr_holidays_compute_days.field_hr_holidays_status_exclude_public_holidays +msgid "Exclude Public Holidays" +msgstr "Isključi državne praznike" + +#. module: hr_holidays_compute_days +#: model:ir.model.fields,field_description:hr_holidays_compute_days.field_hr_holidays_status_exclude_rest_days +msgid "Exclude Rest Days" +msgstr "Isključi dane odmora" + +#. module: hr_holidays_compute_days +#: model:ir.model.fields,help:hr_holidays_compute_days.field_hr_holidays_status_exclude_public_holidays +msgid "If enabled, public holidays are skipped in leave days calculation." +msgstr "" +"Ako je omogućeno, jdržavni praznici su isključeni iz izračuna broja " +"slobodnih dana." + +#. module: hr_holidays_compute_days +#: model:ir.model.fields,help:hr_holidays_compute_days.field_hr_holidays_status_exclude_rest_days +msgid "" +"If enabled, the employee's day off is skipped in leave days calculation." +msgstr "" + +#. module: hr_holidays_compute_days +#: model:ir.model,name:hr_holidays_compute_days.model_hr_holidays +msgid "Leave" +msgstr "Odsustvo" + +#. module: hr_holidays_compute_days +#: model:ir.model,name:hr_holidays_compute_days.model_hr_holidays_status +msgid "Leave Type" +msgstr "Vrsta odsustva" + +#. module: hr_holidays_compute_days +#: code:addons/hr_holidays_compute_days/models/hr_holidays.py:46 +#: code:addons/hr_holidays_compute_days/models/hr_holidays.py:67 +#, python-format +msgid "" +"You cannot schedule the end date on a public holiday or employee's rest day" +msgstr "" + +#. module: hr_holidays_compute_days +#: code:addons/hr_holidays_compute_days/models/hr_holidays.py:42 +#: code:addons/hr_holidays_compute_days/models/hr_holidays.py:56 +#, python-format +msgid "" +"You cannot schedule the start date on a public holiday or employee's rest " +"day" +msgstr "" diff --git a/hr_holidays_compute_days/tests/test_holidays_compute_days.py b/hr_holidays_compute_days/tests/test_holidays_compute_days.py index a30e22aa9e07..b8ff53b6ed2e 100644 --- a/hr_holidays_compute_days/tests/test_holidays_compute_days.py +++ b/hr_holidays_compute_days/tests/test_holidays_compute_days.py @@ -164,7 +164,7 @@ def test_schedule_on_public_holiday(self): 'date_from': '1994-10-25 08:00:00', 'date_to': '1994-10-28 18:00:00', }) - leave._onchange_employee(self.employee2.id) + leave._onchange_employee() def test_leave_allocation_ok(self): """allocate 10 days of holidays""" diff --git a/hr_holidays_imposed_days/i18n/fr.po b/hr_holidays_imposed_days/i18n/fr.po index 382419a86556..aceaf5d6f1ad 100644 --- a/hr_holidays_imposed_days/i18n/fr.po +++ b/hr_holidays_imposed_days/i18n/fr.po @@ -3,15 +3,15 @@ # * hr_holidays_imposed_days # # Translators: -# leemannd , 2017 # OCA Transbot , 2017 +# guillaume bauer , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-05 02:38+0000\n" -"PO-Revision-Date: 2017-05-05 02:38+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2017-07-17 12:55+0000\n" +"PO-Revision-Date: 2017-07-17 12:55+0000\n" +"Last-Translator: guillaume bauer , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_auto_confirm msgid "Auto confirm" -msgstr "" +msgstr "Confirmation automatique" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_company_id @@ -42,12 +42,12 @@ msgstr "Créé le" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_date_from msgid "Date from" -msgstr "" +msgstr "Depuis" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_date_to msgid "Date to" -msgstr "" +msgstr "A" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_display_name @@ -62,12 +62,12 @@ msgstr "Employé" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_employee_ids msgid "Employee ids" -msgstr "" +msgstr "ID employé" #. module: hr_holidays_imposed_days #: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_form msgid "Employees" -msgstr "" +msgstr "Employés" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_id @@ -79,18 +79,20 @@ msgstr "ID" msgid "" "If empty, all employees of the company will have this day/period imposed" msgstr "" +"Si vide, tous les employés de la compagnie auront ces jours / cette période " +"imposés." #. module: hr_holidays_imposed_days #: model:ir.actions.act_window,name:hr_holidays_imposed_days.action_hr_holidays_imposed_view #: model:ir.ui.menu,name:hr_holidays_imposed_days.menu_hr_holidays_imposed_view msgid "Imposed Days" -msgstr "" +msgstr "Jours imposés" #. module: hr_holidays_imposed_days #: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_form #: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_tree msgid "Imposed days" -msgstr "" +msgstr "Jours imposés" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed___last_update @@ -110,12 +112,12 @@ msgstr "Dernière mise à jour le" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_status_id msgid "Leave type" -msgstr "" +msgstr "Type de congé" #. module: hr_holidays_imposed_days #: model:ir.model,name:hr_holidays_imposed_days.model_hr_holidays_imposed msgid "Manage imposed holidays" -msgstr "" +msgstr "Gestion des jours imposés" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_name @@ -125,16 +127,16 @@ msgstr "Nom" #. module: hr_holidays_imposed_days #: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_number_of_days msgid "Number of days" -msgstr "" +msgstr "Nombre de jours" #. module: hr_holidays_imposed_days #: code:addons/hr_holidays_imposed_days/models/hr_imposed_holidays.py:95 #: code:addons/hr_holidays_imposed_days/models/hr_imposed_holidays.py:121 #, python-format msgid "The start date must be anterior to the end date." -msgstr "" +msgstr "La date de début doit être antérieure à la date de fin." #. module: hr_holidays_imposed_days #: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_form msgid "validate" -msgstr "" +msgstr "Valider" diff --git a/hr_holidays_imposed_days/i18n/hr.po b/hr_holidays_imposed_days/i18n/hr.po new file mode 100644 index 000000000000..3ad316242265 --- /dev/null +++ b/hr_holidays_imposed_days/i18n/hr.po @@ -0,0 +1,139 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_imposed_days +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_auto_confirm +msgid "Auto confirm" +msgstr "Automatski potvrdi" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_company_id +msgid "Company" +msgstr "Organizacija" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_date_from +msgid "Date from" +msgstr "Datum od" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_date_to +msgid "Date to" +msgstr "Datum do" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_holidays_imposed_days +#: model:ir.model,name:hr_holidays_imposed_days.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_employee_ids +msgid "Employee ids" +msgstr "ID-ovi djelatnka" + +#. module: hr_holidays_imposed_days +#: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_form +msgid "Employees" +msgstr "Djelatnici" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,help:hr_holidays_imposed_days.field_hr_holidays_imposed_employee_ids +msgid "" +"If empty, all employees of the company will have this day/period imposed" +msgstr "" + +#. module: hr_holidays_imposed_days +#: model:ir.actions.act_window,name:hr_holidays_imposed_days.action_hr_holidays_imposed_view +#: model:ir.ui.menu,name:hr_holidays_imposed_days.menu_hr_holidays_imposed_view +msgid "Imposed Days" +msgstr "" + +#. module: hr_holidays_imposed_days +#: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_form +#: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_tree +msgid "Imposed days" +msgstr "" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_status_id +msgid "Leave type" +msgstr "Vrsta odsustva" + +#. module: hr_holidays_imposed_days +#: model:ir.model,name:hr_holidays_imposed_days.model_hr_holidays_imposed +msgid "Manage imposed holidays" +msgstr "" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_name +msgid "Name" +msgstr "Naziv" + +#. module: hr_holidays_imposed_days +#: model:ir.model.fields,field_description:hr_holidays_imposed_days.field_hr_holidays_imposed_number_of_days +msgid "Number of days" +msgstr "Broj dana" + +#. module: hr_holidays_imposed_days +#: code:addons/hr_holidays_imposed_days/models/hr_imposed_holidays.py:95 +#: code:addons/hr_holidays_imposed_days/models/hr_imposed_holidays.py:121 +#, python-format +msgid "The start date must be anterior to the end date." +msgstr "Početni datum mora prethoditi završnom." + +#. module: hr_holidays_imposed_days +#: model:ir.ui.view,arch_db:hr_holidays_imposed_days.hr_holidays_imposed_view_form +msgid "validate" +msgstr "ovjeri" diff --git a/hr_holidays_leave_auto_approve/i18n/hr.po b/hr_holidays_leave_auto_approve/i18n/hr.po new file mode 100644 index 000000000000..3a809481478d --- /dev/null +++ b/hr_holidays_leave_auto_approve/i18n/hr.po @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_leave_auto_approve +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_leave_auto_approve +#: model:ir.model.fields,field_description:hr_holidays_leave_auto_approve.field_hr_holidays_status_auto_approve +msgid "Auto Approve" +msgstr "Automatski odobri" + +#. module: hr_holidays_leave_auto_approve +#: model:ir.model.fields,help:hr_holidays_leave_auto_approve.field_hr_holidays_status_auto_approve +msgid "" +"If True, leaves belonging to this leave type will be automatically approved" +msgstr "" +"Ako je označeno, odsustva koja pripadaju ovom tipu odsustva će biti " +"automatski odobrena." + +#. module: hr_holidays_leave_auto_approve +#: model:ir.model,name:hr_holidays_leave_auto_approve.model_hr_holidays +msgid "Leave" +msgstr "Odsustvo" + +#. module: hr_holidays_leave_auto_approve +#: model:ir.model,name:hr_holidays_leave_auto_approve.model_hr_holidays_status +msgid "Leave Type" +msgstr "Vrsta odsustva" diff --git a/hr_holidays_legal_leave/i18n/de.po b/hr_holidays_legal_leave/i18n/de.po index f5778ddb6c87..46a997990fd4 100644 --- a/hr_holidays_legal_leave/i18n/de.po +++ b/hr_holidays_legal_leave/i18n/de.po @@ -3,15 +3,15 @@ # * hr_holidays_legal_leave # # Translators: -# OCA Transbot , 2016 -# Niki Waibel , 2016 +# Niki Waibel , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-29 01:35+0000\n" -"PO-Revision-Date: 2016-11-29 01:35+0000\n" -"Last-Translator: Niki Waibel , 2016\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,7 +27,7 @@ msgstr "Unternehmen" #. module: hr_holidays_legal_leave #: model:ir.model,name:hr_holidays_legal_leave.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" #. module: hr_holidays_legal_leave #: model:ir.model,name:hr_holidays_legal_leave.model_hr_holidays_status diff --git a/hr_holidays_legal_leave/i18n/fr.po b/hr_holidays_legal_leave/i18n/fr.po index 2f05b37be8e3..979103043721 100644 --- a/hr_holidays_legal_leave/i18n/fr.po +++ b/hr_holidays_legal_leave/i18n/fr.po @@ -5,13 +5,14 @@ # Translators: # OCA Transbot , 2016 # leemannd , 2017 +# guillaume bauer , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-28 02:12+0000\n" -"PO-Revision-Date: 2017-01-28 02:12+0000\n" -"Last-Translator: leemannd , 2017\n" +"POT-Creation-Date: 2017-07-17 12:55+0000\n" +"PO-Revision-Date: 2017-07-17 12:55+0000\n" +"Last-Translator: guillaume bauer , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,12 +38,12 @@ msgstr "Type de Congé" #. module: hr_holidays_legal_leave #: model:ir.model.fields,field_description:hr_holidays_legal_leave.field_res_company_legal_holidays_status_id msgid "Legal Leave Status" -msgstr "" +msgstr "Statuts des congés légaux" #. module: hr_holidays_legal_leave #: model:ir.model.fields,field_description:hr_holidays_legal_leave.field_hr_holidays_status_is_annual msgid "Legal/Annual" -msgstr "" +msgstr "Légal / Annuel" #. module: hr_holidays_legal_leave #: code:addons/hr_holidays_legal_leave/models/hr_employee.py:17 @@ -50,6 +51,7 @@ msgstr "" #, python-format msgid "Legal/annual leave type is not defined for your company." msgstr "" +"Le type de congé légal / annuel n'est pas défini pour votre compagnie." #. module: hr_holidays_legal_leave #: model:ir.model.fields,help:hr_holidays_legal_leave.field_hr_holidays_status_is_annual @@ -58,9 +60,12 @@ msgid "" "leave type can have this checkbox. You cannot unset it directly. Set it on " "another Leave type instead. " msgstr "" +"Utilisez ce type de congé comme légal / annuel pour la société actuelle. Un " +"seul type de congé peut avoir cette case de coché. Vous ne pouvez pas le " +"désactiver directement. Réglez-le sur un autre type de congé." #. module: hr_holidays_legal_leave #: code:addons/hr_holidays_legal_leave/models/hr_employee.py:36 #, python-format msgid "You cannot reduce validated allocation requests." -msgstr "" +msgstr "Vous ne pouvez pas réduire les demandes d'allocation validées." diff --git a/hr_holidays_legal_leave/i18n/hr.po b/hr_holidays_legal_leave/i18n/hr.po new file mode 100644 index 000000000000..0b698519540b --- /dev/null +++ b/hr_holidays_legal_leave/i18n/hr.po @@ -0,0 +1,65 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_legal_leave +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:53+0000\n" +"PO-Revision-Date: 2017-07-04 06:53+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_legal_leave +#: model:ir.model,name:hr_holidays_legal_leave.model_res_company +msgid "Companies" +msgstr "Organizacije" + +#. module: hr_holidays_legal_leave +#: model:ir.model,name:hr_holidays_legal_leave.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_holidays_legal_leave +#: model:ir.model,name:hr_holidays_legal_leave.model_hr_holidays_status +msgid "Leave Type" +msgstr "Vrsta odsustva" + +#. module: hr_holidays_legal_leave +#: model:ir.model.fields,field_description:hr_holidays_legal_leave.field_res_company_legal_holidays_status_id +msgid "Legal Leave Status" +msgstr "" + +#. module: hr_holidays_legal_leave +#: model:ir.model.fields,field_description:hr_holidays_legal_leave.field_hr_holidays_status_is_annual +msgid "Legal/Annual" +msgstr "" + +#. module: hr_holidays_legal_leave +#: code:addons/hr_holidays_legal_leave/models/hr_employee.py:17 +#: code:addons/hr_holidays_legal_leave/models/hr_employee.py:44 +#, python-format +msgid "Legal/annual leave type is not defined for your company." +msgstr "" + +#. module: hr_holidays_legal_leave +#: model:ir.model.fields,help:hr_holidays_legal_leave.field_hr_holidays_status_is_annual +msgid "" +"Use this Leave type as Legal/Annual for current company. One and only one " +"leave type can have this checkbox. You cannot unset it directly. Set it on " +"another Leave type instead. " +msgstr "" + +#. module: hr_holidays_legal_leave +#: code:addons/hr_holidays_legal_leave/models/hr_employee.py:36 +#, python-format +msgid "You cannot reduce validated allocation requests." +msgstr "" diff --git a/hr_holidays_legal_leave/i18n/sl.po b/hr_holidays_legal_leave/i18n/sl.po index 8633847ce3eb..df1eea49fa17 100644 --- a/hr_holidays_legal_leave/i18n/sl.po +++ b/hr_holidays_legal_leave/i18n/sl.po @@ -3,14 +3,14 @@ # * hr_holidays_legal_leave # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-29 01:35+0000\n" -"PO-Revision-Date: 2016-11-29 01:35+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +31,7 @@ msgstr "Kader" #. module: hr_holidays_legal_leave #: model:ir.model,name:hr_holidays_legal_leave.model_hr_holidays_status msgid "Leave Type" -msgstr "" +msgstr "Tip dopusta" #. module: hr_holidays_legal_leave #: model:ir.model.fields,field_description:hr_holidays_legal_leave.field_res_company_legal_holidays_status_id diff --git a/hr_holidays_legal_leave/views/hr_holidays_status.xml b/hr_holidays_legal_leave/views/hr_holidays_status.xml index 6b9316c2a8b4..44e2d93248bb 100644 --- a/hr_holidays_legal_leave/views/hr_holidays_status.xml +++ b/hr_holidays_legal_leave/views/hr_holidays_status.xml @@ -5,10 +5,9 @@ hr.holidays.status - - - + diff --git a/hr_holidays_meeting_name/README.rst b/hr_holidays_meeting_name/README.rst new file mode 100644 index 000000000000..ec0b56a38dea --- /dev/null +++ b/hr_holidays_meeting_name/README.rst @@ -0,0 +1,48 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +======================== +HR holidays meeting name +======================== + +This module allows to leave generated meeting name personalization according to the leave type. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/116/10.0 + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. +Credits +======= + +Contributors +------------ + +* Adrien Peiffer + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/hr_holidays_meeting_name/__init__.py b/hr_holidays_meeting_name/__init__.py new file mode 100644 index 000000000000..0650744f6bc6 --- /dev/null +++ b/hr_holidays_meeting_name/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_holidays_meeting_name/__manifest__.py b/hr_holidays_meeting_name/__manifest__.py new file mode 100644 index 000000000000..7e096806d4a5 --- /dev/null +++ b/hr_holidays_meeting_name/__manifest__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2015-2017 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + 'name': "HR holidays meeting name", + + 'summary': """ + Personnalize meeting name generated by leaves""", + 'author': 'ACSONE SA/NV,' + 'Odoo Community Association (OCA)', + 'website': "http://acsone.eu", + 'category': 'Human Resources', + 'version': '10.0.1.0.0', + 'license': 'AGPL-3', + 'depends': [ + 'hr_holidays', + ], + 'data': [ + 'views/hr_holidays_view.xml', + ], +} diff --git a/hr_holidays_meeting_name/i18n/ar.po b/hr_holidays_meeting_name/i18n/ar.po new file mode 100644 index 000000000000..870a1cb6c4c3 --- /dev/null +++ b/hr_holidays_meeting_name/i18n/ar.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_meeting_name +# +# Translators: +# abdullah alsabi , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: abdullah alsabi , 2017\n" +"Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays +msgid "Leave" +msgstr "إجازة" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays_status +msgid "Leave Type" +msgstr "نوع الإجازة" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_meeting_description +msgid "Meeting description" +msgstr "" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_use_leave_name_for_meeting +msgid "Use leave name for meeting description" +msgstr "" diff --git a/hr_holidays_meeting_name/i18n/de.po b/hr_holidays_meeting_name/i18n/de.po new file mode 100644 index 000000000000..674f77eca05b --- /dev/null +++ b/hr_holidays_meeting_name/i18n/de.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_meeting_name +# +# Translators: +# Niki Waibel , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Niki Waibel , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays +msgid "Leave" +msgstr "Urlaub" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays_status +msgid "Leave Type" +msgstr "Urlaubsart" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_meeting_description +msgid "Meeting description" +msgstr "" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_use_leave_name_for_meeting +msgid "Use leave name for meeting description" +msgstr "" diff --git a/hr_holidays_meeting_name/i18n/es.po b/hr_holidays_meeting_name/i18n/es.po new file mode 100644 index 000000000000..2060d63d9124 --- /dev/null +++ b/hr_holidays_meeting_name/i18n/es.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_meeting_name +# +# Translators: +# José Antonio Cuello , 2017 +# Pedro M. Baeza , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Pedro M. Baeza , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays +msgid "Leave" +msgstr "Ausencia" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays_status +msgid "Leave Type" +msgstr "Tipo de ausencia" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_meeting_description +msgid "Meeting description" +msgstr "" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_use_leave_name_for_meeting +msgid "Use leave name for meeting description" +msgstr "" diff --git a/hr_holidays_meeting_name/i18n/fr.po b/hr_holidays_meeting_name/i18n/fr.po new file mode 100644 index 000000000000..64ca35250e71 --- /dev/null +++ b/hr_holidays_meeting_name/i18n/fr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_meeting_name +# +# Translators: +# leemannd , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: leemannd , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays +msgid "Leave" +msgstr "Congé" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays_status +msgid "Leave Type" +msgstr "Type de Congé" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_meeting_description +msgid "Meeting description" +msgstr "" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_use_leave_name_for_meeting +msgid "Use leave name for meeting description" +msgstr "" diff --git a/hr_holidays_meeting_name/i18n/hr.po b/hr_holidays_meeting_name/i18n/hr.po new file mode 100644 index 000000000000..6076861762f4 --- /dev/null +++ b/hr_holidays_meeting_name/i18n/hr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_meeting_name +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays +msgid "Leave" +msgstr "Odsustvo" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays_status +msgid "Leave Type" +msgstr "Vrsta odsustva" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_meeting_description +msgid "Meeting description" +msgstr "" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_use_leave_name_for_meeting +msgid "Use leave name for meeting description" +msgstr "" diff --git a/hr_holidays_meeting_name/i18n/hr_HR.po b/hr_holidays_meeting_name/i18n/hr_HR.po new file mode 100644 index 000000000000..5c6f02b92145 --- /dev/null +++ b/hr_holidays_meeting_name/i18n/hr_HR.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_meeting_name +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays +msgid "Leave" +msgstr "Odsustvo" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays_status +msgid "Leave Type" +msgstr "Tip odsustva" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_meeting_description +msgid "Meeting description" +msgstr "" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_use_leave_name_for_meeting +msgid "Use leave name for meeting description" +msgstr "" diff --git a/hr_holidays_meeting_name/i18n/sl.po b/hr_holidays_meeting_name/i18n/sl.po new file mode 100644 index 000000000000..561b439ab527 --- /dev/null +++ b/hr_holidays_meeting_name/i18n/sl.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_meeting_name +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays +msgid "Leave" +msgstr "Dopust" + +#. module: hr_holidays_meeting_name +#: model:ir.model,name:hr_holidays_meeting_name.model_hr_holidays_status +msgid "Leave Type" +msgstr "Tip dopusta" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_meeting_description +msgid "Meeting description" +msgstr "" + +#. module: hr_holidays_meeting_name +#: model:ir.model.fields,field_description:hr_holidays_meeting_name.field_hr_holidays_status_use_leave_name_for_meeting +msgid "Use leave name for meeting description" +msgstr "" diff --git a/hr_holidays_meeting_name/models/__init__.py b/hr_holidays_meeting_name/models/__init__.py new file mode 100644 index 000000000000..6b017d76066e --- /dev/null +++ b/hr_holidays_meeting_name/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import hr_holidays diff --git a/hr_holidays_meeting_name/models/hr_holidays.py b/hr_holidays_meeting_name/models/hr_holidays.py new file mode 100644 index 000000000000..5ed0cc8a3d5b --- /dev/null +++ b/hr_holidays_meeting_name/models/hr_holidays.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Copyright 2015-2017 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models, fields, api + + +class HrHolidaysStatus(models.Model): + _inherit = "hr.holidays.status" + + use_leave_name_for_meeting = fields.Boolean( + string='Use leave name for meeting description', default=True) + meeting_description = fields.Char(translate=True) + + +class HrHolidays(models.Model): + _inherit = 'hr.holidays' + + @api.multi + def action_validate(self): + res = super(HrHolidays, self).action_validate() + for record in self: + leave_type = record.holiday_status_id + if record.meeting_id and\ + not leave_type.use_leave_name_for_meeting and \ + leave_type.meeting_description: + record.meeting_id.name =\ + record.holiday_status_id.meeting_description + return res diff --git a/hr_holidays_meeting_name/static/description/icon.png b/hr_holidays_meeting_name/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/hr_holidays_meeting_name/static/description/icon.png differ diff --git a/hr_holidays_meeting_name/tests/__init__.py b/hr_holidays_meeting_name/tests/__init__.py new file mode 100644 index 000000000000..1f8a318c35a1 --- /dev/null +++ b/hr_holidays_meeting_name/tests/__init__.py @@ -0,0 +1 @@ +from . import test_hr_holidays_meeting_name diff --git a/hr_holidays_meeting_name/tests/test_hr_holidays_meeting_name.py b/hr_holidays_meeting_name/tests/test_hr_holidays_meeting_name.py new file mode 100644 index 000000000000..4e39cf896729 --- /dev/null +++ b/hr_holidays_meeting_name/tests/test_hr_holidays_meeting_name.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import time + +from odoo.tests.common import TransactionCase + + +class HrHolidaysMeetingName(TransactionCase): + + def setUp(self): + super(HrHolidaysMeetingName, self).setUp() + self.leave_type = self.env.ref('hr_holidays.holiday_status_cl') + self.leave_obj = self.env['hr.holidays'] + self.employee01 = self.env.ref('hr.employee_root') + + def create_leave(self): + start = time.strftime('%Y-%m-10') + end = time.strftime('%Y-%m-11') + leave = self.leave_obj.create({ + 'name': 'test', + 'type': 'remove', + 'holiday_type': 'employee', + 'date_from': start, + 'date_to': end, + 'number_of_days_temp': 1.0, + 'employee_id': self.employee01.id, + 'holiday_status_id': self.leave_type.id, + }) + return leave + + def test_1(self): + leave = self.create_leave() + leave.action_validate() + self.assertTrue(len(leave.meeting_id) == 1) + self.assertEqual(leave.meeting_id.name, leave.display_name) + + def test_2(self): + meeting_description = 'Test meeting name' + self.leave_type.write({ + 'use_leave_name_for_meeting': False, + 'meeting_description': meeting_description + }) + leave = self.create_leave() + leave.action_validate() + self.assertTrue(len(leave.meeting_id) == 1) + self.assertEqual(leave.meeting_id.name, meeting_description) diff --git a/hr_holidays_meeting_name/views/hr_holidays_view.xml b/hr_holidays_meeting_name/views/hr_holidays_view.xml new file mode 100644 index 000000000000..a8aeefbd2ed6 --- /dev/null +++ b/hr_holidays_meeting_name/views/hr_holidays_view.xml @@ -0,0 +1,14 @@ + + + + hr.holidays.status.form (hr_holidays_meeting_name) + hr.holidays.status + + + + + + + + + \ No newline at end of file diff --git a/hr_holidays_notify_employee_manager/README.rst b/hr_holidays_notify_employee_manager/README.rst new file mode 100644 index 000000000000..56ae6206c9e2 --- /dev/null +++ b/hr_holidays_notify_employee_manager/README.rst @@ -0,0 +1,68 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +=================================== +HR Holidays Notify Employee Manager +=================================== + +This module extends the functionality of the Leaves App to make possible +to notify by mail the manager of the employee requesting the leave. + +Configuration +============= + +To configure this module, you need to: + +#. Go to *Leaves > Configuration > Settings*. +#. Check *Leave Requests notified to employee's manager* box. + +Usage +===== + +To use this module, you need to: + +#. Go to *Leaves > My Leaves > Leaves Request* and create a leave request to be + approved. +#. Your manager will be notified by email. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/116/10.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Lois Rilo +* Miquel Raïch + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/hr_holidays_notify_employee_manager/__init__.py b/hr_holidays_notify_employee_manager/__init__.py new file mode 100644 index 000000000000..7201c0805195 --- /dev/null +++ b/hr_holidays_notify_employee_manager/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/hr_holidays_notify_employee_manager/__manifest__.py b/hr_holidays_notify_employee_manager/__manifest__.py new file mode 100644 index 000000000000..ce2bf8ef8127 --- /dev/null +++ b/hr_holidays_notify_employee_manager/__manifest__.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "HR Holidays Notify Employee Manager", + "summary": "Notify employee's manager by mail on Leave Requests " + "creation.", + "version": "10.0.1.0.0", + "category": "Human Resources", + "website": "https://github.com/OCA/hr", + "author": "Eficent, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": ["hr_holidays_settings"], + "data": ['views/hr_holidays_config_settings.xml'], +} diff --git a/hr_holidays_notify_employee_manager/i18n/ar.po b/hr_holidays_notify_employee_manager/i18n/ar.po new file mode 100644 index 000000000000..55b2258e5065 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/ar.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# abdullah alsabi , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: abdullah alsabi , 2017\n" +"Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "الشركات" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "إجازة" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/de.po b/hr_holidays_notify_employee_manager/i18n/de.po new file mode 100644 index 000000000000..5462860b7cab --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/de.po @@ -0,0 +1,58 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +# Niki Waibel , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Niki Waibel , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Unternehmen" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "Urlaub" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/es.po b/hr_holidays_notify_employee_manager/i18n/es.po new file mode 100644 index 000000000000..8c54fbf5f4f0 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/es.po @@ -0,0 +1,58 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +# Pedro M. Baeza , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Pedro M. Baeza , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Compañías" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "Ausencia" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/fi.po b/hr_holidays_notify_employee_manager/i18n/fi.po new file mode 100644 index 000000000000..e161709fc8c6 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/fi.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Yritykset" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/fr.po b/hr_holidays_notify_employee_manager/i18n/fr.po new file mode 100644 index 000000000000..19e93b23ec68 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/fr.po @@ -0,0 +1,58 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +# leemannd , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: leemannd , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Entreprises" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "Congé" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/fr_CH.po b/hr_holidays_notify_employee_manager/i18n/fr_CH.po new file mode 100644 index 000000000000..9af898f32d58 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/fr_CH.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holiday_notify_employee_manager +# +# Translators: +# leemannd , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-10 01:29+0000\n" +"PO-Revision-Date: 2017-06-10 01:29+0000\n" +"Last-Translator: leemannd , 2017\n" +"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/23907/fr_CH/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr_CH\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_holiday_notify_employee_manager +#: model:ir.model,name:hr_holiday_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Compagnie" + +#. module: hr_holiday_notify_employee_manager +#: model:ir.model,name:hr_holiday_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "Congé" + +#. module: hr_holiday_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holiday_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holiday_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holiday_notify_employee_manager.view_company_form +msgid "Leaves Management" +msgstr "" + +#. module: hr_holiday_notify_employee_manager +#: model:ir.model.fields,help:hr_holiday_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/hr.po b/hr_holidays_notify_employee_manager/i18n/hr.po new file mode 100644 index 000000000000..189bf6c82f48 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/hr.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Organizacije" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "Odsustvo" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/hr_HR.po b/hr_holidays_notify_employee_manager/i18n/hr_HR.po new file mode 100644 index 000000000000..1e9596d9e853 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/hr_HR.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Poduzeća" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "Odsustvo" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/it.po b/hr_holidays_notify_employee_manager/i18n/it.po new file mode 100644 index 000000000000..8bcd11ab2379 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/it.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Aziende" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/nl_NL.po b/hr_holidays_notify_employee_manager/i18n/nl_NL.po new file mode 100644 index 000000000000..e1f897d8310e --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/nl_NL.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# Cas Vissers , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Cas Vissers , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Bedrijven" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/pt_BR.po b/hr_holidays_notify_employee_manager/i18n/pt_BR.po new file mode 100644 index 000000000000..eecc33a4a4ae --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/pt_BR.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Empresas" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/ro.po b/hr_holidays_notify_employee_manager/i18n/ro.po new file mode 100644 index 000000000000..e77bc7b01691 --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/ro.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Companii" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/i18n/sl.po b/hr_holidays_notify_employee_manager/i18n/sl.po new file mode 100644 index 000000000000..6ee91ccc416f --- /dev/null +++ b/hr_holidays_notify_employee_manager/i18n/sl.po @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_notify_employee_manager +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_res_company +msgid "Companies" +msgstr "Družbe" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays +msgid "Leave" +msgstr "Dopust" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "Leave Requests notified to employee's manager" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,field_description:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +msgid "Leave Requests notified to employee's manager (*)" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.ui.view,arch_db:hr_holidays_notify_employee_manager.hr_holidays_config_settings +msgid "Leaves Management" +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_hr_holidays_config_settings_leave_notify_manager +#: model:ir.model.fields,help:hr_holidays_notify_employee_manager.field_res_company_leave_notify_manager +msgid "" +"When a leave request is created the employee's manager will be added as " +"follower and notified by email." +msgstr "" + +#. module: hr_holidays_notify_employee_manager +#: model:ir.model,name:hr_holidays_notify_employee_manager.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_notify_employee_manager/models/__init__.py b/hr_holidays_notify_employee_manager/models/__init__.py new file mode 100644 index 000000000000..0c481b4db102 --- /dev/null +++ b/hr_holidays_notify_employee_manager/models/__init__.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import hr_holidays +from . import hr_holidays_config_settings +from . import res_company diff --git a/hr_holidays_notify_employee_manager/models/hr_holidays.py b/hr_holidays_notify_employee_manager/models/hr_holidays.py new file mode 100644 index 000000000000..f32958e831af --- /dev/null +++ b/hr_holidays_notify_employee_manager/models/hr_holidays.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class HrHolidays(models.Model): + _inherit = 'hr.holidays' + + @api.multi + def _get_approvers_to_notify(self): + """Defines who to notify.""" + self.ensure_one() + company = self.employee_id.company_id + if company.leave_notify_manager and self.employee_id.parent_id: + return self.employee_id.parent_id + return False + + @api.model + def create(self, vals): + res = super(HrHolidays, self).create(vals) + res._notify_approvers() + return res + + @api.multi + def _notify_approvers(self): + """Input: res.user""" + self.ensure_one() + approvers = self._get_approvers_to_notify() + if not approvers: + return True + for approver in approvers: + self.add_follower(approver.id) + if approver.user_id: + self._message_auto_subscribe_notify( + [approver.user_id.partner_id.id]) + return True diff --git a/hr_holidays_notify_employee_manager/models/hr_holidays_config_settings.py b/hr_holidays_notify_employee_manager/models/hr_holidays_config_settings.py new file mode 100644 index 000000000000..a576aa2f531c --- /dev/null +++ b/hr_holidays_notify_employee_manager/models/hr_holidays_config_settings.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class HrHolidaysConfigSettings(models.TransientModel): + _inherit = 'hr.holidays.config.settings' + + leave_notify_manager = fields.Boolean( + related='company_id.leave_notify_manager', + string="Leave Requests notified to employee's manager (*)", + help="When a leave request is created the employee's manager " + "will be added as follower and notified by email.") diff --git a/hr_holidays_notify_employee_manager/models/res_company.py b/hr_holidays_notify_employee_manager/models/res_company.py new file mode 100644 index 000000000000..9a9066de7eb0 --- /dev/null +++ b/hr_holidays_notify_employee_manager/models/res_company.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResCompany(models.Model): + _inherit = 'res.company' + + leave_notify_manager = fields.Boolean( + string="Leave Requests notified to employee's manager", + help="When a leave request is created the employee's manager " + "will be added as follower and notified by email.") diff --git a/hr_holidays_notify_employee_manager/static/description/icon.png b/hr_holidays_notify_employee_manager/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/hr_holidays_notify_employee_manager/static/description/icon.png differ diff --git a/hr_holidays_notify_employee_manager/tests/__init__.py b/hr_holidays_notify_employee_manager/tests/__init__.py new file mode 100644 index 000000000000..e0127da8ed90 --- /dev/null +++ b/hr_holidays_notify_employee_manager/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_hr_holiday_notify_employee_manager diff --git a/hr_holidays_notify_employee_manager/tests/test_hr_holiday_notify_employee_manager.py b/hr_holidays_notify_employee_manager/tests/test_hr_holiday_notify_employee_manager.py new file mode 100644 index 000000000000..443f1448e3ae --- /dev/null +++ b/hr_holidays_notify_employee_manager/tests/test_hr_holiday_notify_employee_manager.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestNotifyEmployeeManager(TransactionCase): + def setUp(self): + super(TestNotifyEmployeeManager, self).setUp() + self.hol_model = self.env['hr.holidays'] + self.user_model = self.env['res.users'] + self.emp_model = self.env['hr.employee'] + self.type_model = self.env['hr.holidays.status'] + + self.user = self.user_model.create({ + 'name': 'Test User', + 'login': 'user', + 'email': 'test.user@example.com'}) + self.manager = self.user_model.create({ + 'name': 'Test Manager', + 'login': 'manager', + 'email': 'test.manager@example.com'}) + emp_manager = self.emp_model.create({ + 'name': 'Test Manager', + 'user_id': self.manager.id}) + self.employee = self.emp_model.create({ + 'name': 'Test employee', + 'user_id': self.user.id, + 'parent_id': emp_manager.id}) + self.holiday_type = self.type_model.create({'name': 'Leave'}) + + def test_add_follower(self): + """Tests if the employee's manager is added as follower to the leave + request. + """ + manager = self.manager.partner_id + # With the configuration disabled: + self.employee.company_id.leave_notify_manager = False + leave = self.hol_model.sudo(self.user).create({ + 'name': 'No-return-trip to Fiji', + 'holiday_status_id': self.holiday_type.id}) + follower_set = manager in leave.message_follower_ids.mapped( + 'partner_id') if manager else False + self.assertFalse(follower_set, "Follower added unexpectedly.") + # With the configuration enabled: + self.employee.company_id.leave_notify_manager = True + leave = self.hol_model.sudo(self.user).create({ + 'name': 'No-return-trip to Bahamas', + 'holiday_status_id': self.holiday_type.id}) + follower_set = manager in leave.message_follower_ids.mapped( + 'partner_id') if manager else False + self.assertTrue(follower_set, "Employee's manager hasn't been added " + "as follower.") diff --git a/hr_holidays_notify_employee_manager/views/hr_holidays_config_settings.xml b/hr_holidays_notify_employee_manager/views/hr_holidays_config_settings.xml new file mode 100644 index 000000000000..fbf041e208e5 --- /dev/null +++ b/hr_holidays_notify_employee_manager/views/hr_holidays_config_settings.xml @@ -0,0 +1,17 @@ + + + + + hr.holidays.config.settings.form + hr.holidays.config.settings + + +
+ + + +
+ + + + diff --git a/hr_holidays_settings/README.rst b/hr_holidays_settings/README.rst new file mode 100644 index 000000000000..15b3e02ec10f --- /dev/null +++ b/hr_holidays_settings/README.rst @@ -0,0 +1,57 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +==================== +HR Holidays Settings +==================== + +This module adds a Settings form in the menu of Leaves (HR Holidays module). +This settings are empty by default but enable other modules to be able to extend it. + +Usage +===== + +To use this module, you need to: + +#. Go to *Leaves > Configuration > Settings*. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/116/10.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Miquel Raïch + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/hr_holidays_settings/__init__.py b/hr_holidays_settings/__init__.py new file mode 100644 index 000000000000..7201c0805195 --- /dev/null +++ b/hr_holidays_settings/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/hr_holidays_settings/__manifest__.py b/hr_holidays_settings/__manifest__.py new file mode 100644 index 000000000000..6d05eba66caa --- /dev/null +++ b/hr_holidays_settings/__manifest__.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "HR Holidays Settings", + "summary": "Enables Settings Form for HR Holidays.", + "version": "10.0.1.1.0", + "category": "Human Resources", + "website": "https://github.com/OCA/hr", + "author": "Eficent, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": ["hr_holidays"], + "data": ['views/hr_holidays_config_settings.xml'], +} diff --git a/hr_holidays_settings/i18n/ar.po b/hr_holidays_settings/i18n/ar.po new file mode 100644 index 000000000000..245388afe888 --- /dev/null +++ b/hr_holidays_settings/i18n/ar.po @@ -0,0 +1,100 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# abdullah alsabi , 2017 +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" +"(*) This configuration is related to the company you're logged " +"into." + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "إلغاء" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "الشركة" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "انشئ من قبل" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "وقت الانشاء" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "إسم العرض" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "اخر تعديل من قبل" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "اخر تعديل في" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/de.po b/hr_holidays_settings/i18n/de.po new file mode 100644 index 000000000000..c1c044977d60 --- /dev/null +++ b/hr_holidays_settings/i18n/de.po @@ -0,0 +1,98 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# Niki Waibel , 2017 +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Erstellt von" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Angelegt am" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "Anzeigename" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "Zuletzt geändert am" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zuletzt aktualisiert durch" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Zuletzt aktualisiert am" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/es.po b/hr_holidays_settings/i18n/es.po new file mode 100644 index 000000000000..9e5122f3698d --- /dev/null +++ b/hr_holidays_settings/i18n/es.po @@ -0,0 +1,100 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# José Antonio Cuello , 2017 +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" +"(*) Esta configuración es relativa a la compañía donde estas " +"conectado." + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "Cancelar" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "Compañía" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Creado el" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "Mostrar nombre" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "Última modificación el" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Última actualización el" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/fi.po b/hr_holidays_settings/i18n/fi.po new file mode 100644 index 000000000000..9ab45ed2afac --- /dev/null +++ b/hr_holidays_settings/i18n/fi.po @@ -0,0 +1,97 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Luonut" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Luotu" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Viimeksi päivittänyt" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Viimeksi päivitetty" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/fr.po b/hr_holidays_settings/i18n/fr.po new file mode 100644 index 000000000000..891ec143f578 --- /dev/null +++ b/hr_holidays_settings/i18n/fr.po @@ -0,0 +1,101 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# leemannd , 2017 +# OCA Transbot , 2017 +# guillaume bauer , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: guillaume bauer , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" +"(*) Cette configuration est liée à la société dans laquelle vous vous " +"êtes connecté " + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "Annuler" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "Entreprise" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Créé par" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Créé le" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "Nom affiché" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "Dernière modification le" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Dernière modification par" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Dernière mise à jour le" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/hr.po b/hr_holidays_settings/i18n/hr.po new file mode 100644 index 000000000000..383e4c69d8fb --- /dev/null +++ b/hr_holidays_settings/i18n/hr.po @@ -0,0 +1,97 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "Odustani" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "Organizacija" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/hr_HR.po b/hr_holidays_settings/i18n/hr_HR.po new file mode 100644 index 000000000000..f8ecae582e1e --- /dev/null +++ b/hr_holidays_settings/i18n/hr_HR.po @@ -0,0 +1,99 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" +"(*) ove postavke su povezane sa poduzećem u koje ste trenutno " +"prijavljeni." + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "Odustani" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "Poduzeće" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "Zadnje ažurirano" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/it.po b/hr_holidays_settings/i18n/it.po new file mode 100644 index 000000000000..ed33f8c24002 --- /dev/null +++ b/hr_holidays_settings/i18n/it.po @@ -0,0 +1,97 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Creato da" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Creato il" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Ultimo aggiornamento di" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Ultimo aggiornamento il" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/nl_NL.po b/hr_holidays_settings/i18n/nl_NL.po new file mode 100644 index 000000000000..5fa62fd1fb58 --- /dev/null +++ b/hr_holidays_settings/i18n/nl_NL.po @@ -0,0 +1,100 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# Peter Hageman , 2017 +# Cas Vissers , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Cas Vissers , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" +"(*) Deze configuratie is gerelateerd aan het bedrijf waarmee mee je " +"ingelogd bent." + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "Annuleer" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "Bedrijf" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Aangemaakt door" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Aangemaakt op" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "Weergavenaam" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "Laatst gewijzigd op" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Laatst bijgewerkt door" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Laatst bijgewerkt op" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/pt_BR.po b/hr_holidays_settings/i18n/pt_BR.po new file mode 100644 index 000000000000..b66f623acc30 --- /dev/null +++ b/hr_holidays_settings/i18n/pt_BR.po @@ -0,0 +1,97 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Criado por" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Criado em" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/ro.po b/hr_holidays_settings/i18n/ro.po new file mode 100644 index 000000000000..189ffda2e83c --- /dev/null +++ b/hr_holidays_settings/i18n/ro.po @@ -0,0 +1,97 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Creeat de către" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Creeat în" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Ultima actualizare de către" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Ultima actualizare în" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/i18n/sl.po b/hr_holidays_settings/i18n/sl.po new file mode 100644 index 000000000000..b7f9e7fd4d01 --- /dev/null +++ b/hr_holidays_settings/i18n/sl.po @@ -0,0 +1,97 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_settings +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Cancel" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.actions.act_window,name:hr_holidays_settings.hr_holidays_config_settings_action +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Configure HR Holidays" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_uid +msgid "Created by" +msgstr "Ustvaril" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_create_date +msgid "Created on" +msgstr "Ustvarjeno" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_display_name +msgid "Display Name" +msgstr "Prikazni naziv" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings___last_update +msgid "Last Modified on" +msgstr "Zadnjič spremenjeno" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zadnjič posodobil" + +#. module: hr_holidays_settings +#: model:ir.model.fields,field_description:hr_holidays_settings.field_hr_holidays_config_settings_write_date +msgid "Last Updated on" +msgstr "Zadnjič posodobljeno" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_status +msgid "Leave Types" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.view,arch_db:hr_holidays_settings.hr_holidays_config_settings +msgid "Save" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.ui.menu,name:hr_holidays_settings.menu_hr_holidays_global_settings +msgid "Settings" +msgstr "" + +#. module: hr_holidays_settings +#: model:ir.model,name:hr_holidays_settings.model_hr_holidays_config_settings +msgid "hr.holidays.config.settings" +msgstr "" diff --git a/hr_holidays_settings/models/__init__.py b/hr_holidays_settings/models/__init__.py new file mode 100644 index 000000000000..2b085589e609 --- /dev/null +++ b/hr_holidays_settings/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import hr_holidays_config_settings diff --git a/hr_holidays_settings/models/hr_holidays_config_settings.py b/hr_holidays_settings/models/hr_holidays_config_settings.py new file mode 100644 index 000000000000..76e383ae0929 --- /dev/null +++ b/hr_holidays_settings/models/hr_holidays_config_settings.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class HrHolidaysConfigSettings(models.TransientModel): + _name = 'hr.holidays.config.settings' + _inherit = 'res.config.settings' + + company_id = fields.Many2one('res.company', string='Company', + required=True, + default=lambda self: self.env.user.company_id) diff --git a/hr_holidays_settings/static/description/icon.png b/hr_holidays_settings/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/hr_holidays_settings/static/description/icon.png differ diff --git a/hr_holidays_settings/views/hr_holidays_config_settings.xml b/hr_holidays_settings/views/hr_holidays_config_settings.xml new file mode 100644 index 000000000000..13117a5cf02f --- /dev/null +++ b/hr_holidays_settings/views/hr_holidays_config_settings.xml @@ -0,0 +1,42 @@ + + + + + hr.holidays.config.settings.form + hr.holidays.config.settings + +
+
+
+ + + +
+ (*) This configuration is related to the company you're logged into. +
+
+ + + + + Configure HR Holidays + ir.actions.act_window + hr.holidays.config.settings + form + form + inline + + + + + + + diff --git a/hr_payroll_cancel/models/hr_payroll.py b/hr_payroll_cancel/models/hr_payroll.py index 1b8859432f34..6ac8411d49bc 100644 --- a/hr_payroll_cancel/models/hr_payroll.py +++ b/hr_payroll_cancel/models/hr_payroll.py @@ -32,4 +32,5 @@ def action_payslip_cancel(self): raise ValidationError(_("""To cancel the Original Payslip the Refunded Payslip needed to be canceled first!""")) payslip.move_id.button_cancel() + payslip.move_id.unlink() return payslip.write({'state': 'cancel'}) diff --git a/hr_public_holidays/README.rst b/hr_public_holidays/README.rst index d0e136a02cf0..385ca71d30a5 100644 --- a/hr_public_holidays/README.rst +++ b/hr_public_holidays/README.rst @@ -6,39 +6,41 @@ HR Public Holidays ================== -This module is a technical module to handle public holidays. +This module allows to define public holidays at country or state level by year. -Installation -============ - -To install this module, you need to: - -* clone the branch 10.0 of the repository https://github.com/OCA/hr -* add the path to this repository in your configuration (addons-path) -* update the module list -* search for "Public Holidays" in your addons -* install the module +These holidays will be taken into account in standard resource allocation and +requests, and can be used by other modules as base data. Configuration ============= -No extra configuration needed. +#. Go to *Leaves > Public Holidays > Public Holidays*. +#. Create a record, specifying: + + * Year for the holidays you are going to set. + * Optionally, a country where the holidays apply. If not set, it means + holidays are global. +#. On "Public Holidays" section, introduce a line for each of the holidays + you want to specify. +#. Optionally, you can set at line level several countries for limiting the + holidays to that countries. + +On following years, you can speed up public holidays creation using a wizard: + +#. Go to *Leaves > Public Holidays > Create Next Year Public Holidays*. +#. If there's no special situation, you only need to click on "Create" for + applying the same holidays as this year for the next. +#. If you need to generate holidays for another year different from next one, + or take as source another year different from the last one, go to the + "Optional" page for configuring these parameters. Usage ===== -Go to the menu *Leaves > Public Holidays > Public Holidays* and create your -public holidays. - .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot :target: https://runbot.odoo-community.org/runbot/116/10.0 -Known issues / Roadmap -====================== - - - Bug Tracker =========== @@ -65,6 +67,7 @@ Contributors * Salton Massally (iDT Labs) * Ivan Yelizariev * Bassirou Ndaw +* Tecnativa - Pedro M. Baeza Maintainer ---------- diff --git a/hr_public_holidays/i18n/de.po b/hr_public_holidays/i18n/de.po index cda78f894a7e..99b03f603195 100644 --- a/hr_public_holidays/i18n/de.po +++ b/hr_public_holidays/i18n/de.po @@ -3,14 +3,15 @@ # * hr_public_holidays # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 +# Niki Waibel , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Niki Waibel , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,7 +146,7 @@ msgstr "Zuletzt aktualisiert am" #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_display_name #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_name msgid "Name" -msgstr "Bezeichnung" +msgstr "Name" #. module: hr_public_holidays #: code:addons/hr_public_holidays/wizards/public_holidays_next_year_wizard.py:41 diff --git a/hr_public_holidays/i18n/es.po b/hr_public_holidays/i18n/es.po index f56924a74b80..020de1cc9bcd 100644 --- a/hr_public_holidays/i18n/es.po +++ b/hr_public_holidays/i18n/es.po @@ -3,15 +3,16 @@ # * hr_public_holidays # # Translators: -# OCA Transbot , 2016 -# José Antonio Cuello , 2017 +# OCA Transbot , 2017 +# José Antonio Cuello , 2017 +# Pedro M. Baeza , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" -"Last-Translator: José Antonio Cuello , 2017\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Pedro M. Baeza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -140,7 +141,7 @@ msgstr "Última actualización por" #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_write_date #: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_write_date msgid "Last Updated on" -msgstr "Última actualización en" +msgstr "Última actualización el" #. module: hr_public_holidays #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_display_name diff --git a/hr_public_holidays/i18n/fr.po b/hr_public_holidays/i18n/fr.po index 49224a5dc6a3..3e8eef5f8886 100644 --- a/hr_public_holidays/i18n/fr.po +++ b/hr_public_holidays/i18n/fr.po @@ -3,14 +3,14 @@ # * hr_public_holidays # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 # leemannd , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" "Last-Translator: leemannd , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" @@ -133,14 +133,14 @@ msgstr "Dernière modification le" #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_write_uid #: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_write_uid msgid "Last Updated by" -msgstr "Mis-à-jour par" +msgstr "Dernière modification par" #. module: hr_public_holidays #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_write_date #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_write_date #: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_write_date msgid "Last Updated on" -msgstr "Mis-à-jour le" +msgstr "Dernière mise à jour le" #. module: hr_public_holidays #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_display_name diff --git a/hr_public_holidays/i18n/hr.po b/hr_public_holidays/i18n/hr.po new file mode 100644 index 000000000000..a45093518002 --- /dev/null +++ b/hr_public_holidays/i18n/hr.po @@ -0,0 +1,260 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_public_holidays +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:53+0000\n" +"PO-Revision-Date: 2017-07-04 06:53+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "" +"By default, the most recent public holidays \n" +" for each country are used as template to create \n" +" public holidays for the year following the templates.\n" +"

\n" +" Normally, you should not need to input anything in \n" +" optional fields and only need to click on the button \n" +" \"Create\"." +msgstr "" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_year_id +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_year +msgid "Calendar Year" +msgstr "Kalendarska godina" + +#. module: hr_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "Cancel" +msgstr "Odustani" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_country_id +msgid "Country" +msgstr "Država" + +#. module: hr_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "Create" +msgstr "Kreiraj" + +#. module: hr_public_holidays +#: model:ir.actions.act_window,name:hr_public_holidays.action_create_next_year_public_holidays +#: model:ir.ui.menu,name:hr_public_holidays.menu_create_next_year_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "Create Next Year Public Holidays" +msgstr "Kreiraj državne praznike za sljedeću godinu" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_create_uid +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_create_uid +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_create_date +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_create_date +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_public_holidays +#: model:ir.model,name:hr_public_holidays.model_public_holidays_next_year_wizard +msgid "Creates public holidays from existing ones" +msgstr "Kreiraj državne praznike iz postojećih" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_date +msgid "Date" +msgstr "Datum" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_variable +msgid "Date may change" +msgstr "Datum može varirati" + +#. module: hr_public_holidays +#: code:addons/hr_public_holidays/models/hr_public_holidays_line.py:45 +#, 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" + +#. module: hr_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "Defaults" +msgstr "Zadane vrijednosti" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_display_name +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_ids +msgid "Holiday Dates" +msgstr "Datumi praznika" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_id +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_id +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_id +msgid "ID" +msgstr "ID" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public___last_update +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line___last_update +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_write_uid +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_write_uid +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_write_date +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_write_date +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_display_name +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_name +msgid "Name" +msgstr "Naziv" + +#. module: hr_public_holidays +#: code:addons/hr_public_holidays/wizards/public_holidays_next_year_wizard.py:41 +#, 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." + +#. module: hr_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "Optional" +msgstr "Opcionalno" + +#. module: hr_public_holidays +#: model:ir.actions.act_window,name:hr_public_holidays.open_public_holidays_view +#: model:ir.model,name:hr_public_holidays.model_hr_holidays_public +#: model:ir.ui.menu,name:hr_public_holidays.menu_hr_public_holidays +#: model:ir.ui.menu,name:hr_public_holidays.menu_public_holidays_view +#: model:ir.ui.view,arch_db:hr_public_holidays.view_public_holidays_form +#: model:ir.ui.view,arch_db:hr_public_holidays.view_public_holidays_tree +msgid "Public Holidays" +msgstr "Državni praznici" + +#. module: hr_public_holidays +#: model:ir.model,name:hr_public_holidays.model_hr_holidays_public_line +msgid "Public Holidays Lines" +msgstr "Stavke državnih praznika" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_state_ids +msgid "Related States" +msgstr "Povezane županije" + +#. module: hr_public_holidays +#: model:ir.model.fields,help:hr_public_holidays.field_public_holidays_next_year_wizard_template_ids +msgid "" +"Select the public holidays to use as template. If not set, latest public " +"holidays of each country will be used. Only the last templates of each " +"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 "" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_template_ids +msgid "Templates" +msgstr "Predlošci" + +#. module: hr_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "" +"The below optional fields are here only to handle \n" +" special situations like \"2011 was a special year with \n" +" an additional public holiday for the 150th \n" +" anniversary of the Italian unification, so you want to \n" +" replicate the 2010 Italian holidays to 2012.\"" +msgstr "" + +#. module: hr_public_holidays +#: model:ir.ui.view,arch_db:hr_public_holidays.public_holidays_next_year_wizard_view +msgid "" +"Use this wizard to create public holidays based on the \n" +" existing ones.
\n" +" Only the last templates of each country \n" +" will be taken into account (If you select templates \n" +" from 2012 and 2015 of the same country; '\n" +" only the templates from 2015 will be taken into \n" +" account)." +msgstr "" + +#. module: hr_public_holidays +#: model:ir.model.fields,field_description:hr_public_holidays.field_public_holidays_next_year_wizard_year +msgid "Year" +msgstr "" + +#. module: hr_public_holidays +#: model:ir.model.fields,help:hr_public_holidays.field_public_holidays_next_year_wizard_year +msgid "" +"Year for which you want to create the public holidays. By default, the year " +"following the template." +msgstr "" + +#. module: hr_public_holidays +#: code:addons/hr_public_holidays/models/hr_public_holidays_line.py:57 +#, python-format +msgid "" +"You can't create duplicate public holiday per date %s and one of the country" +" states." +msgstr "" + +#. module: hr_public_holidays +#: code:addons/hr_public_holidays/models/hr_public_holidays_line.py:64 +#, python-format +msgid "You can't create duplicate public holiday per date %s." +msgstr "" + +#. module: hr_public_holidays +#: code:addons/hr_public_holidays/models/hr_public_holidays.py:53 +#, python-format +msgid "You can't create duplicate public holiday per year and/or country" +msgstr "" + +#. module: hr_public_holidays +#: code:addons/hr_public_holidays/wizards/public_holidays_next_year_wizard.py:79 +#, 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 "" diff --git a/hr_public_holidays/i18n/sl.po b/hr_public_holidays/i18n/sl.po index a300b869cd34..688baa5533e5 100644 --- a/hr_public_holidays/i18n/sl.po +++ b/hr_public_holidays/i18n/sl.po @@ -3,14 +3,14 @@ # * hr_public_holidays # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 03:37+0000\n" -"PO-Revision-Date: 2017-03-03 03:37+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,7 +143,7 @@ msgstr "Zadnjič posodobljeno" #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_display_name #: model:ir.model.fields,field_description:hr_public_holidays.field_hr_holidays_public_line_name msgid "Name" -msgstr "Naziv" +msgstr "Ime" #. module: hr_public_holidays #: code:addons/hr_public_holidays/wizards/public_holidays_next_year_wizard.py:41 diff --git a/hr_public_holidays/models/__init__.py b/hr_public_holidays/models/__init__.py index 65ba2206c62a..65c2d0677320 100644 --- a/hr_public_holidays/models/__init__.py +++ b/hr_public_holidays/models/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# © 2015 2011,2013 Michael Telahun Makonnen # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import hr_public_holidays_line diff --git a/hr_skill/README.rst b/hr_skill/README.rst index 5b2fa8ee27af..53d947a35b27 100644 --- a/hr_skill/README.rst +++ b/hr_skill/README.rst @@ -30,6 +30,7 @@ Contributors * Savoir-faire Linux * Daniel Reis * Ivan Yelizariev +* Julien Laloux Maintainer ---------- diff --git a/hr_skill/__init__.py b/hr_skill/__init__.py index 0650744f6bc6..5de4ae33a50f 100644 --- a/hr_skill/__init__.py +++ b/hr_skill/__init__.py @@ -1 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Savoir-faire Linux +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + from . import models diff --git a/hr_skill/__manifest__.py b/hr_skill/__manifest__.py index 035422e53cba..4ea4f931acca 100644 --- a/hr_skill/__manifest__.py +++ b/hr_skill/__manifest__.py @@ -1,26 +1,10 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (C) 2013 Savoir-faire Linux (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### +# Copyright 2013 Savoir-faire Linux +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Skill Management", - "version": "8.0.1.1.0", + "version": "10.0.1.0.0", "category": "Human Resources", "license": "AGPL-3", "author": "Savoir-faire Linux,Odoo Community Association (OCA)", @@ -31,5 +15,5 @@ "views/hr_employee.xml", "security/ir.model.access.csv", ], - 'installable': False, + 'installable': True, } diff --git a/hr_skill/i18n/ar.po b/hr_skill/i18n/ar.po index f2ff09adfb15..a60ffa7ed601 100644 --- a/hr_skill/i18n/ar.po +++ b/hr_skill/i18n/ar.po @@ -3,14 +3,16 @@ # * hr_skill # # Translators: +# abdullah alsabi , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-02-25 21:28+0000\n" -"Last-Translator: OCA Transbot \n" -"Language-Team: Arabic (http://www.transifex.com/oca/OCA-hr-8-0/language/ar/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,37 +20,42 @@ msgstr "" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" -msgstr "" +msgstr "الأبناء" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "انشئ من قبل" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "وقت الانشاء" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "إسم العرض" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" msgstr "الموظف" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" msgstr "" @@ -58,61 +65,62 @@ msgid "Employees" msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "اخر تعديل من قبل" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "اخر تعديل في" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" msgstr "" #. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "" - -#. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" msgstr "" diff --git a/hr_skill/i18n/de.po b/hr_skill/i18n/de.po index b9833383e11c..552ef74a3555 100644 --- a/hr_skill/i18n/de.po +++ b/hr_skill/i18n/de.po @@ -3,18 +3,16 @@ # * hr_skill # # Translators: -# Rudolf Schnapka , 2015 -# Rudolf Schnapka , 2015 -# Thomas A. Jaeger, 2015 -# Thomas A. Jaeger, 2015 +# Niki Waibel , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-19 11:54+0000\n" -"PO-Revision-Date: 2015-11-24 09:17+0000\n" -"Last-Translator: Rudolf Schnapka \n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -22,101 +20,107 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" -msgstr "Aktiv" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" -msgstr "Untergeordnete Fähigkeiten" +msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "Untergeordnete" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Erstellt von" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Angelegt am" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "Anzeigename" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" -msgstr "Angestellte" +msgstr "Angestellter" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" -msgstr "Angestellte(r)" +msgstr "" #. module: hr_skill #: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree msgid "Employees" -msgstr "Angestellte" +msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "ID" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "Zuletzt geändert am" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "Zuletzt aktualisiert durch" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "Zuletzt aktualisiert am" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" -msgstr "Bezeichnung" +msgstr "Name" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" -msgstr "Übergeordneter" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" -msgstr "Übergeordnet Links" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" -msgstr "Übergeordnet Rechts" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" -msgstr "Fähigkeit" +msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" -msgstr "Fähigkeiten" - -#. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "Fähigkeitenverwaltung" +msgstr "" #. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" -msgstr "Fähigkeitenhierarchie" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" +msgstr "" diff --git a/hr_skill/i18n/es.po b/hr_skill/i18n/es.po index e992c2e1f63a..ff73df98bb15 100644 --- a/hr_skill/i18n/es.po +++ b/hr_skill/i18n/es.po @@ -3,17 +3,16 @@ # * hr_skill # # Translators: -# Antonio Trueba, 2016 -# Antonio Trueba, 2016 -# FIRST AUTHOR , 2013 +# José Antonio Cuello , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-26 02:41+0000\n" -"PO-Revision-Date: 2016-05-24 20:25+0000\n" -"Last-Translator: OCA Transbot \n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-hr-8-0/language/es/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -21,32 +20,32 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" -msgstr "Activo" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" -msgstr "Habilidades hijas" +msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "Hijo" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Creado por" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Creado el" #. module: hr_skill -#: field:hr.skill,display_name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name msgid "Display Name" msgstr "Mostrar nombre" @@ -56,76 +55,72 @@ msgid "Employee" msgstr "Empleado" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" -msgstr "Empleado(s)" +msgstr "" #. module: hr_skill #: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree msgid "Employees" -msgstr "Empleados" +msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "ID" #. module: hr_skill -#: field:hr.skill,__last_update:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update msgid "Last Modified on" msgstr "Última modificación el" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "Última actualización por" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" -msgstr "Última actualización en" +msgstr "Última actualización el" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "Nombre" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" -msgstr "Padre" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" -msgstr "Habilidad" +msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" -msgstr "Habilidades" - -#. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "Manejo de Habilidades" +msgstr "" #. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" -msgstr "Jerarquía de Habilidades" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" +msgstr "" diff --git a/hr_skill/i18n/fi.po b/hr_skill/i18n/fi.po index 5a8161fbce49..7910d6b27102 100644 --- a/hr_skill/i18n/fi.po +++ b/hr_skill/i18n/fi.po @@ -3,15 +3,15 @@ # * hr_skill # # Translators: -# Jarmo Kortetjärvi , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-14 04:15+0000\n" -"PO-Revision-Date: 2016-04-04 11:07+0000\n" -"Last-Translator: Jarmo Kortetjärvi \n" -"Language-Team: Finnish (http://www.transifex.com/oca/OCA-hr-8-0/language/fi/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,101 +19,107 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" -msgstr "Aktiivinen" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" -msgstr "Taidon alaluokat" +msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "Alaluokat" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Luonut" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Luotu" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" msgstr "Työntekijä" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" -msgstr "Työntekijä(t)" +msgstr "" #. module: hr_skill #: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree msgid "Employees" -msgstr "Työntekijät" +msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "ID" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "Viimeksi päivittänyt" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "Viimeksi päivitetty" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "Nimi" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" -msgstr "Yllätaso" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" -msgstr "Vasen ylätaso" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" -msgstr "Oikea ylätaso" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" -msgstr "Taito" +msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" -msgstr "Taidot" - -#. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "Taitojen hallinta" +msgstr "" #. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" -msgstr "Taitojen rakenne" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" +msgstr "" diff --git a/hr_skill/i18n/fr.po b/hr_skill/i18n/fr.po index e26cfce66eae..c29a602008e9 100644 --- a/hr_skill/i18n/fr.po +++ b/hr_skill/i18n/fr.po @@ -3,16 +3,17 @@ # * hr_skill # # Translators: -# Mohamed HABOU , 2016 -# Youness RHANDOUR , 2016 +# leemannd , 2017 +# guillaume bauer , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 05:19+0000\n" -"PO-Revision-Date: 2016-01-11 17:20+0000\n" -"Last-Translator: Mohamed HABOU \n" -"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -20,37 +21,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" -msgstr "Actif" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "Enfants" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Créé par" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Créé le" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "Nom affiché" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" msgstr "Employé" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" msgstr "" @@ -60,61 +66,62 @@ msgid "Employees" msgstr "Employés" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "ID" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "Dernière modification le" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "Dernière modification par" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "Dernière mise à jour le" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "Nom" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" -msgstr "Parent" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" msgstr "" #. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "" - -#. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" msgstr "" diff --git a/hr_skill/i18n/hr.po b/hr_skill/i18n/hr.po new file mode 100644 index 000000000000..546f2866c062 --- /dev/null +++ b/hr_skill/i18n/hr.po @@ -0,0 +1,125 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_skill +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active +msgid "Active" +msgstr "" + +#. module: hr_skill +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Child Skills" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids +msgid "Children" +msgstr "Djeca" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_skill +#: model:ir.model,name:hr_skill.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids +msgid "Employee(s)" +msgstr "" + +#. module: hr_skill +#: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree +msgid "Employees" +msgstr "Djelatnici" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id +msgid "ID" +msgstr "ID" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Name" +msgstr "Naziv" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id +msgid "Parent" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left +msgid "Parent Left" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right +msgid "Parent Right" +msgstr "" + +#. module: hr_skill +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Skill" +msgstr "" + +#. module: hr_skill +#: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids +#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +msgid "Skills" +msgstr "" + +#. module: hr_skill +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" +msgstr "" diff --git a/hr_skill/i18n/hr_HR.po b/hr_skill/i18n/hr_HR.po new file mode 100644 index 000000000000..7b9143d5f48e --- /dev/null +++ b/hr_skill/i18n/hr_HR.po @@ -0,0 +1,125 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_skill +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active +msgid "Active" +msgstr "" + +#. module: hr_skill +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Child Skills" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids +msgid "Children" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_skill +#: model:ir.model,name:hr_skill.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids +msgid "Employee(s)" +msgstr "" + +#. module: hr_skill +#: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree +msgid "Employees" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id +msgid "ID" +msgstr "ID" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "Zadnje ažurirano" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date +msgid "Last Updated on" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Name" +msgstr "Naziv" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id +msgid "Parent" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left +msgid "Parent Left" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right +msgid "Parent Right" +msgstr "" + +#. module: hr_skill +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Skill" +msgstr "" + +#. module: hr_skill +#: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids +#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +msgid "Skills" +msgstr "" + +#. module: hr_skill +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" +msgstr "" diff --git a/hr_skill/i18n/it.po b/hr_skill/i18n/it.po index 9496238f7233..cd22be368039 100644 --- a/hr_skill/i18n/it.po +++ b/hr_skill/i18n/it.po @@ -3,15 +3,15 @@ # * hr_skill # # Translators: -# Paolo Valier, 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-12 12:02+0000\n" -"PO-Revision-Date: 2016-03-19 10:41+0000\n" -"Last-Translator: Paolo Valier\n" -"Language-Team: Italian (http://www.transifex.com/oca/OCA-hr-8-0/language/it/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,37 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" -msgstr "Attivo" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Creato da" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Creato il" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" msgstr "Dipendente" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" msgstr "" @@ -59,61 +64,62 @@ msgid "Employees" msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "ID" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "Ultimo aggiornamento di" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "Ultimo aggiornamento il" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "Nome" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" msgstr "" #. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "" - -#. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" msgstr "" diff --git a/hr_skill/i18n/nl_NL.po b/hr_skill/i18n/nl_NL.po new file mode 100644 index 000000000000..ff39c4f5dd5d --- /dev/null +++ b/hr_skill/i18n/nl_NL.po @@ -0,0 +1,127 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_skill +# +# Translators: +# Peter Hageman , 2017 +# Cas Vissers , 2017 +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active +msgid "Active" +msgstr "" + +#. module: hr_skill +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Child Skills" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids +msgid "Children" +msgstr "Kinderen" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid +msgid "Created by" +msgstr "Aangemaakt door" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date +msgid "Created on" +msgstr "Aangemaakt op" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "Weergavenaam" + +#. module: hr_skill +#: model:ir.model,name:hr_skill.model_hr_employee +msgid "Employee" +msgstr "Werknemer" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids +msgid "Employee(s)" +msgstr "" + +#. module: hr_skill +#: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree +msgid "Employees" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id +msgid "ID" +msgstr "ID" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "Laatst gewijzigd op" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid +msgid "Last Updated by" +msgstr "Laatst bijgewerkt door" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date +msgid "Last Updated on" +msgstr "Laatst bijgewerkt op" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Name" +msgstr "Naam" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id +msgid "Parent" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left +msgid "Parent Left" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right +msgid "Parent Right" +msgstr "" + +#. module: hr_skill +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Skill" +msgstr "" + +#. module: hr_skill +#: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids +#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +msgid "Skills" +msgstr "" + +#. module: hr_skill +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" +msgstr "" diff --git a/hr_skill/i18n/pl.po b/hr_skill/i18n/pl.po index 32170e4d1c6f..8415b2896b6f 100644 --- a/hr_skill/i18n/pl.po +++ b/hr_skill/i18n/pl.po @@ -3,52 +3,58 @@ # * hr_skill # # Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-14 04:15+0000\n" -"PO-Revision-Date: 2016-04-05 07:13+0000\n" -"Last-Translator: OCA Transbot \n" -"Language-Team: Polish (http://www.transifex.com/oca/OCA-hr-8-0/language/pl/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" msgstr "" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" msgstr "" @@ -58,61 +64,62 @@ msgid "Employees" msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "Nazwa" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" msgstr "" #. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "" - -#. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" msgstr "" diff --git a/hr_skill/i18n/pt_BR.po b/hr_skill/i18n/pt_BR.po index ebe0e8c13c55..6eea88d421f0 100644 --- a/hr_skill/i18n/pt_BR.po +++ b/hr_skill/i18n/pt_BR.po @@ -3,15 +3,15 @@ # * hr_skill # # Translators: -# danimaribeiro , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-08 03:18+0000\n" -"Last-Translator: danimaribeiro \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-hr-8-0/language/pt_BR/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,37 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" -msgstr "Ativo" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "Filhos" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Criado por" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Criado em" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" msgstr "Empregado" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" msgstr "" @@ -59,61 +64,62 @@ msgid "Employees" msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" msgstr "" #. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "" - -#. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" msgstr "" diff --git a/hr_skill/i18n/ro.po b/hr_skill/i18n/ro.po index 488675708a5d..5bd742733fa1 100644 --- a/hr_skill/i18n/ro.po +++ b/hr_skill/i18n/ro.po @@ -3,14 +3,15 @@ # * hr_skill # # Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-18 13:10+0000\n" -"PO-Revision-Date: 2015-08-16 16:41+0000\n" -"Last-Translator: <>\n" -"Language-Team: Romanian (http://www.transifex.com/oca/OCA-hr-8-0/language/ro/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,32 +19,42 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form +msgid "Child Skills" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Creeat de către" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Creeat în" +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name +msgid "Display Name" +msgstr "" + #. module: hr_skill #: model:ir.model,name:hr_skill.model_hr_employee msgid "Employee" msgstr "Angajat" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" msgstr "" @@ -53,66 +64,62 @@ msgid "Employees" msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "ID" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_skill +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "Ultima actualizare de către" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "Ultima actualizare în" #. module: hr_skill -#: field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,view:0 -#: selection:hr.skill,view:0 +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" msgstr "" #. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "" - -#. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" -msgstr "" - -#. module: hr_skill -#: selection:hr.skill,view:0 -msgid "View" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" msgstr "" diff --git a/hr_skill/i18n/sl.po b/hr_skill/i18n/sl.po index 1a01fab9aeb1..069db10e8811 100644 --- a/hr_skill/i18n/sl.po +++ b/hr_skill/i18n/sl.po @@ -3,15 +3,15 @@ # * hr_skill # # Translators: -# Matjaž Mozetič , 2015 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-30 02:40+0000\n" -"PO-Revision-Date: 2016-04-30 06:16+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-hr-8-0/language/sl/)\n" +"POT-Creation-Date: 2017-11-28 01:44+0000\n" +"PO-Revision-Date: 2017-11-28 01:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,32 +19,32 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" #. module: hr_skill -#: field:hr.skill,active:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_active msgid "Active" -msgstr "Aktivno" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Child Skills" -msgstr "Podrejene veščine" +msgstr "" #. module: hr_skill -#: field:hr.skill,child_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_child_ids msgid "Children" msgstr "Otroci" #. module: hr_skill -#: field:hr.skill,create_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_uid msgid "Created by" msgstr "Ustvaril" #. module: hr_skill -#: field:hr.skill,create_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_create_date msgid "Created on" msgstr "Ustvarjeno" #. module: hr_skill -#: field:hr.skill,display_name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_display_name msgid "Display Name" msgstr "Prikazni naziv" @@ -54,76 +54,72 @@ msgid "Employee" msgstr "Kader" #. module: hr_skill -#: field:hr.skill,employee_ids:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_employee_ids msgid "Employee(s)" -msgstr "Kadri" +msgstr "" #. module: hr_skill #: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree msgid "Employees" -msgstr "Kadri" +msgstr "" #. module: hr_skill -#: field:hr.skill,id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_id msgid "ID" msgstr "ID" #. module: hr_skill -#: field:hr.skill,__last_update:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill___last_update msgid "Last Modified on" msgstr "Zadnjič spremenjeno" #. module: hr_skill -#: field:hr.skill,write_uid:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_uid msgid "Last Updated by" msgstr "Zadnjič posodobil" #. module: hr_skill -#: field:hr.skill,write_date:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_write_date msgid "Last Updated on" msgstr "Zadnjič posodobljeno" #. module: hr_skill -#: view:hr.skill:hr_skill.view_hr_skill_tree -#: view:hr.skill:hr_skill.view_skill_form field:hr.skill,name:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_name +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Name" -msgstr "Naziv" +msgstr "Ime" #. module: hr_skill -#: field:hr.skill,parent_id:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_id msgid "Parent" -msgstr "Nadrejeno" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_left:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_left msgid "Parent Left" -msgstr "Levo nadrejeno" +msgstr "" #. module: hr_skill -#: field:hr.skill,parent_right:0 +#: model:ir.model.fields,field_description:hr_skill.field_hr_skill_parent_right msgid "Parent Right" -msgstr "Desno nadrejeno" +msgstr "" #. module: hr_skill -#: view:hr.skill:hr_skill.view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_skill_form msgid "Skill" -msgstr "Veščina" +msgstr "" #. module: hr_skill -#: view:hr.employee:hr_skill.view_employee_skill_form -#: field:hr.employee,skill_ids:0 view:hr.skill:hr_skill.view_hr_skill_tree #: model:ir.actions.act_window,name:hr_skill.open_view_skill_form +#: model:ir.model.fields,field_description:hr_skill.field_hr_employee_skill_ids #: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_employee_skill_form +#: model:ir.ui.view,arch_db:hr_skill.view_hr_skill_tree msgid "Skills" -msgstr "Veščine" - -#. module: hr_skill -#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt -msgid "Skills Management" -msgstr "Upravljanje veščin" +msgstr "" #. module: hr_skill -#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree -#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree -msgid "Skills Structure" -msgstr "Struktura veščin" +#: model:ir.model,name:hr_skill.model_hr_skill +msgid "hr.skill" +msgstr "" diff --git a/hr_skill/models/__init__.py b/hr_skill/models/__init__.py index d44855af1210..23cfc16a0bb7 100644 --- a/hr_skill/models/__init__.py +++ b/hr_skill/models/__init__.py @@ -1,2 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Savoir-faire Linux +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + from . import hr_skill from . import hr_employee diff --git a/hr_skill/models/hr_employee.py b/hr_skill/models/hr_employee.py index 3c4f2d1aab05..e07d5a593e77 100644 --- a/hr_skill/models/hr_employee.py +++ b/hr_skill/models/hr_employee.py @@ -1,24 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (C) 2013 Savoir-faire Linux (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### +# Copyright 2013 Savoir-faire Linux +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import fields, models +from odoo import fields, models class Employee(models.Model): diff --git a/hr_skill/models/hr_skill.py b/hr_skill/models/hr_skill.py index 73600a3d226a..436c8e3d16d4 100644 --- a/hr_skill/models/hr_skill.py +++ b/hr_skill/models/hr_skill.py @@ -1,24 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (C) 2013 Savoir-faire Linux (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### +# Copyright 2013 Savoir-faire Linux +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import fields, models, api +from odoo import fields, models, api class Skill(models.Model): diff --git a/hr_skill/security/ir.model.access.csv b/hr_skill/security/ir.model.access.csv index 7007b265432a..593d25637380 100644 --- a/hr_skill/security/ir.model.access.csv +++ b/hr_skill/security/ir.model.access.csv @@ -1,3 +1,3 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_skill","hr.skill","model_hr_skill",base.group_hr_user,1,0,0,0 -"access_hr_skill_manager","hr.skill","model_hr_skill",base.group_hr_manager,1,1,1,1 +"access_hr_skill","hr.skill","model_hr_skill","base.group_user",1,0,0,0 +"access_hr_skill_manager","hr.skill","model_hr_skill","hr.group_hr_manager",1,1,1,1 diff --git a/hr_skill/tests/__init__.py b/hr_skill/tests/__init__.py new file mode 100644 index 000000000000..a3491d4d941a --- /dev/null +++ b/hr_skill/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Savoir-faire Linux +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_hr_skill diff --git a/hr_skill/tests/test_hr_skill.py b/hr_skill/tests/test_hr_skill.py new file mode 100644 index 000000000000..d8d0f95e22e0 --- /dev/null +++ b/hr_skill/tests/test_hr_skill.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Savoir-faire Linux +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestHrSkill(TransactionCase): + + def test_name_get(self): + hr_skill_model = self.env['hr.skill'] + soft_skill_id = hr_skill_model.create({'name': 'Soft skill'}) + leadership_skill_id = hr_skill_model.create({ + 'name': 'Leadership', + 'parent_id': soft_skill_id.id + }) + + self.assertEqual( + leadership_skill_id.name_get(), + [(leadership_skill_id.id, u'Soft skill / Leadership')]) diff --git a/hr_skill/views/hr_employee.xml b/hr_skill/views/hr_employee.xml index dbf03e7515ca..f16277a0a9ce 100644 --- a/hr_skill/views/hr_employee.xml +++ b/hr_skill/views/hr_employee.xml @@ -1,5 +1,4 @@ - - + hr.employee.skill.form @@ -8,7 +7,7 @@ - + @@ -30,5 +29,4 @@ - - + diff --git a/hr_skill/views/hr_skill.xml b/hr_skill/views/hr_skill.xml index 0762f3217ca6..1866971f8ce8 100644 --- a/hr_skill/views/hr_skill.xml +++ b/hr_skill/views/hr_skill.xml @@ -1,5 +1,4 @@ - - + hr.skill.tree @@ -34,10 +33,6 @@ - - Skills hr.skill @@ -46,22 +41,9 @@ - - - Skills Structure - hr.skill - tree - - [('parent_id','=',False)] - - - + action="open_view_skill_form" + groups="base.group_no_one"/> - - + diff --git a/hr_worked_days_from_timesheet/README.rst b/hr_worked_days_from_timesheet/README.rst index 2171ce53e66b..1133e062f793 100644 --- a/hr_worked_days_from_timesheet/README.rst +++ b/hr_worked_days_from_timesheet/README.rst @@ -2,21 +2,22 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -========================== -Worked Days From Timesheet -========================== +============================= +HR Worked Days From Timesheet +============================= -* Adds a button to import worked days from timesheet +This module allow you to automatically fill the 'Worked Days' of payslips with +the information of each employee's timesheets for the payslip's period. Installation ============ To install this module, you need to: -* clone the branch 8.0 of the repository https://github.com/OCA/hr +* clone the branch 10.0 of the repository https://github.com/OCA/hr * add the path to this repository in your configuration (addons-path) * update the module list -* search for "Worked Days From Timesheet" in your addons +* search for "HR Worked Days From Timesheet" in your addons * install the module Usage @@ -24,25 +25,22 @@ Usage To use this module, you need to: -* hr_payroll -* hr_timesheet_sheet +#. Go to 'Payroll > Employee Payslips'. +#. Open a draft payslip. +#. In 'Worked Days' section click on 'Import from Timesheets' button. + .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/116/8.0 + :target: https://runbot.odoo-community.org/runbot/116/10.0 -Known issues / Roadmap -====================== - -* Not known issues - Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. Credits ======= @@ -54,6 +52,8 @@ Contributors * Pierre Lamarche * Ignacio Ibeas * OpenSynergy Indonesia +* Lois Rilo Antelo +* Serpent Consulting Services Pvt. Ltd. Maintainer ---------- diff --git a/hr_worked_days_from_timesheet/__init__.py b/hr_worked_days_from_timesheet/__init__.py index 8578e8728c14..25638af62159 100644 --- a/hr_worked_days_from_timesheet/__init__.py +++ b/hr_worked_days_from_timesheet/__init__.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # © 2012 Odoo Canada +# © 2015 Acysos S.L. +# © 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 Serpent Consulting Services Pvt. Ltd. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import models -from . import tests diff --git a/hr_worked_days_from_timesheet/__manifest__.py b/hr_worked_days_from_timesheet/__manifest__.py index 592145b0c24d..20e47c9f9df9 100644 --- a/hr_worked_days_from_timesheet/__manifest__.py +++ b/hr_worked_days_from_timesheet/__manifest__.py @@ -1,14 +1,19 @@ # -*- coding: utf-8 -*- # © 2012 Odoo Canada # © 2015 Acysos S.L. +# © 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 Serpent Consulting Services Pvt. Ltd. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + { - 'name': 'Worked Days From Timesheet', - 'version': '8.0.1.0.0', + 'name': 'HR Worked Days From Timesheet', + 'summary': 'Adds a button to import worked days from timesheet.', + 'version': '10.0.1.0.0', 'license': 'AGPL-3', 'category': 'Generic Modules/Human Resources', - 'author': "Savoir-faire Linux, Acysos S.L.," - "Odoo Community Association (OCA)", + 'author': "Savoir-faire Linux, Acysos S.L., Eficent, " + "Serpent Consulting Services Pvt. Ltd.," + "Odoo Community Association (OCA)", 'website': 'https://www.savoirfairelinux.com/', 'depends': [ 'hr_payroll', @@ -17,5 +22,5 @@ 'data': [ 'views/hr_payslip_view.xml' ], - 'installable': False, + 'installable': True, } diff --git a/hr_worked_days_from_timesheet/i18n/de.po b/hr_worked_days_from_timesheet/i18n/de.po index 146987b97150..0e726d983bdc 100644 --- a/hr_worked_days_from_timesheet/i18n/de.po +++ b/hr_worked_days_from_timesheet/i18n/de.po @@ -3,15 +3,15 @@ # * hr_worked_days_from_timesheet # # Translators: -# Rudolf Schnapka , 2015 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-30 02:40+0000\n" -"PO-Revision-Date: 2016-04-28 15:02+0000\n" -"Last-Translator: OCA Transbot \n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" +"POT-Creation-Date: 2017-06-01 01:36+0000\n" +"PO-Revision-Date: 2017-06-01 01:36+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,12 +19,18 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:48 +#, python-format +msgid "Contract is not defined for one or more payslips." +msgstr "" + +#. module: hr_worked_days_from_timesheet +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Import from Timesheets" msgstr "Import von Zeitnachweisen" #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,imported_from_timesheet:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_imported_from_timesheet msgid "Imported From Timesheet" msgstr "Importierter Zeitnachweis" @@ -39,7 +45,7 @@ msgid "Payslip Worked Days" msgstr "Arbeitstage auf Lohnzettel" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:77 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:80 #, python-format msgid "" "Sorry, but there is no approved Timesheets for the " @@ -47,17 +53,17 @@ msgid "" msgstr "" #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,timesheet_sheet_id:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_timesheet_sheet_id msgid "Timesheet" msgstr "" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:38 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:32 #, python-format msgid "Timesheet %s" msgstr "" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Worked Days" msgstr "Arbeitstage" diff --git a/hr_worked_days_from_timesheet/i18n/es.po b/hr_worked_days_from_timesheet/i18n/es.po index b2ef9f5dc35b..b1ac62c7e2b4 100644 --- a/hr_worked_days_from_timesheet/i18n/es.po +++ b/hr_worked_days_from_timesheet/i18n/es.po @@ -3,14 +3,15 @@ # * hr_worked_days_from_timesheet # # Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-30 02:40+0000\n" -"PO-Revision-Date: 2016-04-28 15:02+0000\n" -"Last-Translator: OCA Transbot \n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-hr-8-0/language/es/)\n" +"POT-Creation-Date: 2017-06-01 01:36+0000\n" +"PO-Revision-Date: 2017-06-01 01:36+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,12 +19,18 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:48 +#, python-format +msgid "Contract is not defined for one or more payslips." +msgstr "" + +#. module: hr_worked_days_from_timesheet +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Import from Timesheets" msgstr "Importar desde parte de horas" #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,imported_from_timesheet:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_imported_from_timesheet msgid "Imported From Timesheet" msgstr "Importado desde parte de horas" @@ -38,25 +45,26 @@ msgid "Payslip Worked Days" msgstr "Días trabajados de la nómina" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:77 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:80 #, python-format msgid "" "Sorry, but there is no approved Timesheets for the " "entire Payslip period" -msgstr "Lo siento, no hay partes de hora aprobador para el periodo de la nómina" +msgstr "" +"Lo siento, no hay partes de hora aprobador para el periodo de la nómina" #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,timesheet_sheet_id:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_timesheet_sheet_id msgid "Timesheet" msgstr "Parte de horas" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:38 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:32 #, python-format msgid "Timesheet %s" msgstr "Parte de horas %s" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Worked Days" msgstr "Días trabajados" diff --git a/hr_worked_days_from_timesheet/i18n/fr.po b/hr_worked_days_from_timesheet/i18n/fr.po index 24b306ab3d20..e27fcb3ebf99 100644 --- a/hr_worked_days_from_timesheet/i18n/fr.po +++ b/hr_worked_days_from_timesheet/i18n/fr.po @@ -3,14 +3,15 @@ # * hr_worked_days_from_timesheet # # Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-30 02:40+0000\n" -"PO-Revision-Date: 2016-04-28 15:02+0000\n" -"Last-Translator: OCA Transbot \n" -"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" +"POT-Creation-Date: 2017-06-01 01:36+0000\n" +"PO-Revision-Date: 2017-06-01 01:36+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,12 +19,18 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:48 +#, python-format +msgid "Contract is not defined for one or more payslips." +msgstr "" + +#. module: hr_worked_days_from_timesheet +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Import from Timesheets" msgstr "Importer les feuilles de temps" #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,imported_from_timesheet:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_imported_from_timesheet msgid "Imported From Timesheet" msgstr "Importé des feuilles de temps" @@ -38,7 +45,7 @@ msgid "Payslip Worked Days" msgstr "Jours travaillés" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:77 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:80 #, python-format msgid "" "Sorry, but there is no approved Timesheets for the " @@ -46,17 +53,17 @@ msgid "" msgstr "" #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,timesheet_sheet_id:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_timesheet_sheet_id msgid "Timesheet" msgstr "" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:38 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:32 #, python-format msgid "Timesheet %s" msgstr "" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Worked Days" msgstr "Jours Travaillés" diff --git a/hr_worked_days_from_timesheet/i18n/sl.po b/hr_worked_days_from_timesheet/i18n/sl.po index 30f43c9fc0c6..7e7237de220a 100644 --- a/hr_worked_days_from_timesheet/i18n/sl.po +++ b/hr_worked_days_from_timesheet/i18n/sl.po @@ -3,15 +3,15 @@ # * hr_worked_days_from_timesheet # # Translators: -# Matjaž Mozetič , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-30 02:40+0000\n" -"PO-Revision-Date: 2016-04-30 06:22+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-hr-8-0/language/sl/)\n" +"POT-Creation-Date: 2017-06-01 01:36+0000\n" +"PO-Revision-Date: 2017-06-01 01:36+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,12 +19,18 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:48 +#, python-format +msgid "Contract is not defined for one or more payslips." +msgstr "" + +#. module: hr_worked_days_from_timesheet +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Import from Timesheets" msgstr "Uvozi iz časovnic" #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,imported_from_timesheet:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_imported_from_timesheet msgid "Imported From Timesheet" msgstr "Uvoženo iz časovnic" @@ -39,7 +45,7 @@ msgid "Payslip Worked Days" msgstr "Delovnih dni na plačilni listi" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:77 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:80 #, python-format msgid "" "Sorry, but there is no approved Timesheets for the " @@ -47,17 +53,17 @@ msgid "" msgstr "Za celotno obdobje plačilne liste ni odobrenih časovnic." #. module: hr_worked_days_from_timesheet -#: field:hr.payslip.worked_days,timesheet_sheet_id:0 +#: model:ir.model.fields,field_description:hr_worked_days_from_timesheet.field_hr_payslip_worked_days_timesheet_sheet_id msgid "Timesheet" msgstr "Časovnica" #. module: hr_worked_days_from_timesheet -#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:38 +#: code:addons/hr_worked_days_from_timesheet/models/hr_payslip.py:32 #, python-format msgid "Timesheet %s" msgstr "Časovnica %s" #. module: hr_worked_days_from_timesheet -#: view:hr.payslip:hr_worked_days_from_timesheet.view_hr_payslip_form +#: model:ir.ui.view,arch_db:hr_worked_days_from_timesheet.view_hr_payslip_form msgid "Worked Days" msgstr "Delovnih dni" diff --git a/hr_worked_days_from_timesheet/models/__init__.py b/hr_worked_days_from_timesheet/models/__init__.py index beab76431502..cdc773143633 100644 --- a/hr_worked_days_from_timesheet/models/__init__.py +++ b/hr_worked_days_from_timesheet/models/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # © 2012 Odoo Canada +# Copyright 2017 Serpent Consulting Services Pvt. Ltd. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import hr_payslip_worked_days diff --git a/hr_worked_days_from_timesheet/models/hr_payslip.py b/hr_worked_days_from_timesheet/models/hr_payslip.py index f0682b88a9ae..104488a412c0 100644 --- a/hr_worked_days_from_timesheet/models/hr_payslip.py +++ b/hr_worked_days_from_timesheet/models/hr_payslip.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- # © 2012 Odoo Canada # © 2015 Acysos S.L. +# © 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 Serpent Consulting Services Pvt. Ltd. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import models, fields, api -from openerp.tools.translate import _ -from openerp.exceptions import Warning as UserError +from odoo import api, fields, models, _ +from odoo.exceptions import UserError class HrPayslip(models.Model): @@ -18,9 +19,6 @@ def _timesheet_mapping(self, timesheet_sheets, payslip, date_from, module and creates a dict of worked days to be created in the payslip. """ # Create one worked days record for each timesheet sheet - wd_model = self.env['hr.payslip.worked_days'] - uom_obj = self.env['product.uom'] - uom_hours = self.env.ref('product.product_uom_hour') for ts_sheet in timesheet_sheets: # Get formated date from the timesheet sheet date_from_formated = fields.Date.to_string( @@ -28,13 +26,9 @@ def _timesheet_mapping(self, timesheet_sheets, payslip, date_from, number_of_hours = 0 for ts in ts_sheet.timesheet_ids: if date_from <= ts.date <= date_to: - unit_amount = uom_obj._compute_qty_obj( - ts.product_uom_id, - ts.unit_amount, uom_hours) - number_of_hours += unit_amount - + number_of_hours += ts.unit_amount if number_of_hours > 0: - wd_model.create({ + self.env['hr.payslip.worked_days'].create({ 'name': _('Timesheet %s') % date_from_formated, 'number_of_hours': number_of_hours, 'contract_id': payslip.contract_id.id, @@ -44,21 +38,30 @@ def _timesheet_mapping(self, timesheet_sheets, payslip, date_from, 'payslip_id': payslip.id, }) + @api.multi + def _check_contract(self): + """Contract is not required field for payslips, yet it is for + payslips.worked_days.""" + for payslip in self: + if not payslip.contract_id: + raise UserError( + _("Contract is not defined for one or more payslips."), + ) + @api.multi def import_worked_days(self): """This method retreives the employee's timesheets for a payslip period and creates worked days records from the imported timesheets """ + self._check_contract() for payslip in self: - date_from = payslip.date_from date_to = payslip.date_to # Delete old imported worked_days # The reason to delete these records is that the user may make # corrections to his timesheets and then reimport these. - wd_model = self.env['hr.payslip.worked_days'] - wd_model.search( + self.env['hr.payslip.worked_days'].search( [('payslip_id', '=', payslip.id), ('imported_from_timesheet', '=', True)]).unlink() @@ -71,17 +74,11 @@ def import_worked_days(self): ] ts_model = self.env['hr_timesheet_sheet.sheet'] timesheet_sheets = ts_model.search(criteria) - if not timesheet_sheets: raise UserError( _("Sorry, but there is no approved Timesheets for the \ entire Payslip period"), ) - # The reason to call this method is for other modules to modify it. - self._timesheet_mapping( - timesheet_sheets, - payslip, - date_from, - date_to - ) + self._timesheet_mapping(timesheet_sheets, payslip, + date_from, date_to) diff --git a/hr_worked_days_from_timesheet/models/hr_payslip_worked_days.py b/hr_worked_days_from_timesheet/models/hr_payslip_worked_days.py index 3d33f9c505b7..c4c24cb3251d 100644 --- a/hr_worked_days_from_timesheet/models/hr_payslip_worked_days.py +++ b/hr_worked_days_from_timesheet/models/hr_payslip_worked_days.py @@ -1,15 +1,21 @@ # -*- coding: utf-8 -*- # © 2012 Odoo Canada # © 2015 Acysos S.L. +# © 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 Serpent Consulting Services Pvt. Ltd. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import models, fields +from odoo import fields, models class HrPayslipWorkedDays(models.Model): _inherit = 'hr.payslip.worked_days' - imported_from_timesheet = fields.Boolean(string='Imported From Timesheet', - default=False) + imported_from_timesheet = fields.Boolean( + string='Imported From Timesheet', + default=False + ) timesheet_sheet_id = fields.Many2one( - string='Timesheet', comodel_name='hr_timesheet_sheet.sheet') + string='Timesheet', + comodel_name='hr_timesheet_sheet.sheet' + ) diff --git a/hr_worked_days_from_timesheet/static/description/icon.png b/hr_worked_days_from_timesheet/static/description/icon.png index 297dc71c85c5..3a0328b516c4 100644 Binary files a/hr_worked_days_from_timesheet/static/description/icon.png and b/hr_worked_days_from_timesheet/static/description/icon.png differ diff --git a/hr_worked_days_from_timesheet/tests/__init__.py b/hr_worked_days_from_timesheet/tests/__init__.py index 755a4b21aa99..071454a9133d 100644 --- a/hr_worked_days_from_timesheet/tests/__init__.py +++ b/hr_worked_days_from_timesheet/tests/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # © 2016 OpenSynergy Indonesia +# Copyright 2017 Serpent Consulting Services Pvt. Ltd. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_worked_days_from_timesheet diff --git a/hr_worked_days_from_timesheet/tests/test_worked_days_from_timesheet.py b/hr_worked_days_from_timesheet/tests/test_worked_days_from_timesheet.py index fa4832dd5b50..16e2553b100c 100644 --- a/hr_worked_days_from_timesheet/tests/test_worked_days_from_timesheet.py +++ b/hr_worked_days_from_timesheet/tests/test_worked_days_from_timesheet.py @@ -1,8 +1,12 @@ # -*- coding: utf-8 -*- -# © 2016 OpenSynergy Indonesia -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# © 2012 Odoo Canada +# © 2015 Acysos S.L. +# © 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 Serpent Consulting Services Pvt. Ltd. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp.tests.common import TransactionCase +from odoo.tests.common import TransactionCase +import time class TestComputeWorkdays(TransactionCase): @@ -11,9 +15,11 @@ def setUp(self): super(TestComputeWorkdays, self).setUp() self.company = self.env.ref('base.main_company') - self.analytic_journal = self.env.ref('hr_timesheet.analytic_journal') self.user_admin = self.env.ref('base.partner_root') + self.timesheet_sheet = self.env['hr_timesheet_sheet.sheet'] + self.project_2 = self.env.ref('project.project_project_2') + # create user user_dict = { 'name': 'User 1', 'login': 'tua@example.com', @@ -21,138 +27,52 @@ def setUp(self): } self.user_test = self.env['res.users'].create(user_dict) + # create Employee employee_dict = { 'name': 'Employee 1', 'user_id': self.user_test.id, - 'journal_id': self.analytic_journal.id, 'address_id': self.user_test.partner_id.id, } self.employee = self.env['hr.employee'].create(employee_dict) + # create Contract contract_dict = { 'name': 'Contract 1', 'employee_id': self.employee.id, - 'wage': 0.0, + 'wage': 10.0, } self.contract = self.env['hr.contract'].create(contract_dict) - analytic_dict = { - 'name': 'Account 1', - 'type': 'normal', - 'use_timesheets': True, - } - - self.analytic = self.env['account.analytic.account'].create( - analytic_dict) - - ts1_dict = { - 'employee_id': self.employee.id, - 'date_from': '2014-01-01', - 'date_to': '2014-01-01', - } - self.ts1 = self.env['hr_timesheet_sheet.sheet'].create(ts1_dict) - - ts2_dict = { - 'employee_id': self.employee.id, - 'date_from': '2014-01-02', - 'date_to': '2014-01-04', - } - self.ts2 = self.env['hr_timesheet_sheet.sheet'].create(ts2_dict) - - ts3_dict = { - 'employee_id': self.employee.id, - 'date_from': '2014-01-05', - 'date_to': '2014-01-15', - } - self.ts3 = self.env['hr_timesheet_sheet.sheet'].create(ts3_dict) - - ts4_dict = { - 'employee_id': self.employee.id, - 'date_from': '2014-01-16', - 'date_to': '2014-01-16', - } - self.ts4 = self.env['hr_timesheet_sheet.sheet'].create(ts4_dict) - - analytic_ts1_dict = { - 'date': '2014-01-01', - 'user_id': self.user_test.id, - 'name': 'ddd', - 'account_id': self.analytic.id, - 'unit_amount': 3.0, - 'journal_id': self.analytic_journal.id, - } - self.analytic_ts1 = self.env['hr.analytic.timesheet'].with_context( - user_id=self.user_test.id).create( - analytic_ts1_dict) - - analytic_ts2_dict = { - 'date': '2014-01-02', - 'user_id': self.user_test.id, - 'name': 'ddd', - 'account_id': self.analytic.id, - 'unit_amount': 5.0, - 'journal_id': self.analytic_journal.id, - 'sheet_id': self.ts2.id, - } - self.analytic_ts2 = self.env['hr.analytic.timesheet'].with_context( - user_id=self.user_test.id).create( - analytic_ts2_dict) - - analytic_ts3_dict = { - 'date': '2014-01-04', - 'user_id': self.user_test.id, - 'sheet_id': self.ts2.id, - 'name': 'ddd', - 'account_id': self.analytic.id, - 'unit_amount': 7.0, - 'journal_id': self.analytic_journal.id, - } - self.analytic_ts3 = self.env['hr.analytic.timesheet'].with_context( - user_id=self.user_test.id).create( - analytic_ts3_dict) - - analytic_ts4_dict = { - 'date': '2014-01-15', + self.timesheet_sheet = self.timesheet_sheet.create({ + 'date_from': time.strftime('%Y-%m-11'), + 'date_to': time.strftime('%Y-%m-17'), + 'name': 'Employee 1', + 'state': 'new', 'user_id': self.user_test.id, - 'sheet_id': self.ts4.id, - 'name': 'ddd', - 'account_id': self.analytic.id, - 'unit_amount': 11.5, - 'journal_id': self.analytic_journal.id, - } - self.analytic_ts4 = self.env['hr.analytic.timesheet'].with_context( - user_id=self.user_test.id).create( - analytic_ts4_dict) + 'employee_id': self.employee.id, + }) - analytic_ts5_dict = { - 'date': '2014-01-16', + # I add 5 hours of work timesheet + self.timesheet_sheet.write({'timesheet_ids': [(0, 0, { + 'project_id': self.project_2.id, + 'date': time.strftime('%Y-%m-11'), + 'name': 'Develop UT for hr module(1)', 'user_id': self.user_test.id, - 'sheet_id': self.ts1.id, - 'name': 'ddd', - 'account_id': self.analytic.id, - 'unit_amount': 13, - 'journal_id': self.analytic_journal.id, - } - self.analytic_ts5 = self.env['hr.analytic.timesheet'].with_context( - user_id=self.user_test.id).create( - analytic_ts5_dict) + 'unit_amount': 5.00, + })]}) - ts = self.ts1 + self.ts2 + self.ts3 + self.ts4 - ts.button_confirm() - ts.signal_workflow('done') + self.timesheet_sheet.action_timesheet_confirm() + self.timesheet_sheet.action_timesheet_done() def test_timesheet_import(self): payslip_dict = { 'employee_id': self.employee.id, 'contract_id': self.contract.id, - 'date_from': '2014-01-02', - 'date_to': '2014-01-15', + 'date_from': time.strftime('%Y-%m-01'), + 'date_to': time.strftime('%Y-%m-21'), } payslip = self.env['hr.payslip'].create( payslip_dict) - payslip.import_worked_days() - for wd in payslip.worked_days_line_ids: - self.assertIn(wd.number_of_hours, [11.5, 12]) payslip.import_worked_days() - self.assertEqual(len(payslip.worked_days_line_ids), 2) + self.assertEqual(payslip.worked_days_line_ids.number_of_hours, 5.0) diff --git a/hr_worked_days_from_timesheet/views/hr_payslip_view.xml b/hr_worked_days_from_timesheet/views/hr_payslip_view.xml index c54165dc3d3c..302a42c9c24b 100644 --- a/hr_worked_days_from_timesheet/views/hr_payslip_view.xml +++ b/hr_worked_days_from_timesheet/views/hr_payslip_view.xml @@ -1,21 +1,22 @@ - - - - hr.payslip.form - hr.payslip - - - - - - -
-
- - + + + + hr.payslip.form + hr.payslip + + + + + + +
+
+ - - - \ No newline at end of file + + + + diff --git a/oca_dependencies.txt b/oca_dependencies.txt index 39c81953a3d4..a1cbfc88c68b 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1,2 +1,3 @@ partner-contact server-tools +account-analytic diff --git a/setup/hr_employee_address_improved/odoo/__init__.py b/setup/hr_employee_address_improved/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_employee_address_improved/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_employee_address_improved/odoo/addons/__init__.py b/setup/hr_employee_address_improved/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_employee_address_improved/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_employee_address_improved/odoo/addons/hr_employee_address_improved b/setup/hr_employee_address_improved/odoo/addons/hr_employee_address_improved new file mode 120000 index 000000000000..9c2b9cfc47c1 --- /dev/null +++ b/setup/hr_employee_address_improved/odoo/addons/hr_employee_address_improved @@ -0,0 +1 @@ +../../../../hr_employee_address_improved \ No newline at end of file diff --git a/setup/hr_employee_address_improved/setup.py b/setup/hr_employee_address_improved/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_employee_address_improved/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_employee_category_parent/odoo/__init__.py b/setup/hr_employee_category_parent/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_employee_category_parent/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_employee_category_parent/odoo/addons/__init__.py b/setup/hr_employee_category_parent/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_employee_category_parent/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_employee_category_parent/odoo/addons/hr_employee_category_parent b/setup/hr_employee_category_parent/odoo/addons/hr_employee_category_parent new file mode 120000 index 000000000000..5e5638167e51 --- /dev/null +++ b/setup/hr_employee_category_parent/odoo/addons/hr_employee_category_parent @@ -0,0 +1 @@ +../../../../hr_employee_category_parent \ No newline at end of file diff --git a/setup/hr_employee_category_parent/setup.py b/setup/hr_employee_category_parent/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_employee_category_parent/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_employee_legacy_id/odoo/__init__.py b/setup/hr_employee_legacy_id/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_employee_legacy_id/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_employee_legacy_id/odoo/addons/__init__.py b/setup/hr_employee_legacy_id/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_employee_legacy_id/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_employee_legacy_id/odoo/addons/hr_employee_legacy_id b/setup/hr_employee_legacy_id/odoo/addons/hr_employee_legacy_id new file mode 120000 index 000000000000..9bd552c6e10f --- /dev/null +++ b/setup/hr_employee_legacy_id/odoo/addons/hr_employee_legacy_id @@ -0,0 +1 @@ +../../../../hr_employee_legacy_id \ No newline at end of file diff --git a/setup/hr_employee_legacy_id/setup.py b/setup/hr_employee_legacy_id/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_employee_legacy_id/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_expense_analytic_distribution/odoo/__init__.py b/setup/hr_expense_analytic_distribution/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_expense_analytic_distribution/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_expense_analytic_distribution/odoo/addons/__init__.py b/setup/hr_expense_analytic_distribution/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_expense_analytic_distribution/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_expense_analytic_distribution/odoo/addons/hr_expense_analytic_distribution b/setup/hr_expense_analytic_distribution/odoo/addons/hr_expense_analytic_distribution new file mode 120000 index 000000000000..2a7220dc6233 --- /dev/null +++ b/setup/hr_expense_analytic_distribution/odoo/addons/hr_expense_analytic_distribution @@ -0,0 +1 @@ +../../../../hr_expense_analytic_distribution \ No newline at end of file diff --git a/setup/hr_expense_analytic_distribution/setup.py b/setup/hr_expense_analytic_distribution/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_expense_analytic_distribution/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_expense_invoice/odoo/__init__.py b/setup/hr_expense_invoice/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_expense_invoice/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_expense_invoice/odoo/addons/__init__.py b/setup/hr_expense_invoice/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_expense_invoice/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_expense_invoice/odoo/addons/hr_expense_invoice b/setup/hr_expense_invoice/odoo/addons/hr_expense_invoice new file mode 120000 index 000000000000..d9b4e9cdc575 --- /dev/null +++ b/setup/hr_expense_invoice/odoo/addons/hr_expense_invoice @@ -0,0 +1 @@ +../../../../hr_expense_invoice \ No newline at end of file diff --git a/setup/hr_expense_invoice/setup.py b/setup/hr_expense_invoice/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_expense_invoice/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_holidays_meeting_name/odoo/__init__.py b/setup/hr_holidays_meeting_name/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_holidays_meeting_name/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_holidays_meeting_name/odoo/addons/__init__.py b/setup/hr_holidays_meeting_name/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_holidays_meeting_name/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_holidays_meeting_name/odoo/addons/hr_holidays_meeting_name b/setup/hr_holidays_meeting_name/odoo/addons/hr_holidays_meeting_name new file mode 120000 index 000000000000..1c468532e7c5 --- /dev/null +++ b/setup/hr_holidays_meeting_name/odoo/addons/hr_holidays_meeting_name @@ -0,0 +1 @@ +../../../../hr_holidays_meeting_name \ No newline at end of file diff --git a/setup/hr_holidays_meeting_name/setup.py b/setup/hr_holidays_meeting_name/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_holidays_meeting_name/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_holidays_notify_employee_manager/odoo/__init__.py b/setup/hr_holidays_notify_employee_manager/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_holidays_notify_employee_manager/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_holidays_notify_employee_manager/odoo/addons/__init__.py b/setup/hr_holidays_notify_employee_manager/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_holidays_notify_employee_manager/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_holidays_notify_employee_manager/odoo/addons/hr_holidays_notify_employee_manager b/setup/hr_holidays_notify_employee_manager/odoo/addons/hr_holidays_notify_employee_manager new file mode 120000 index 000000000000..66fbe2c36591 --- /dev/null +++ b/setup/hr_holidays_notify_employee_manager/odoo/addons/hr_holidays_notify_employee_manager @@ -0,0 +1 @@ +../../../../hr_holidays_notify_employee_manager \ No newline at end of file diff --git a/setup/hr_holidays_notify_employee_manager/setup.py b/setup/hr_holidays_notify_employee_manager/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_holidays_notify_employee_manager/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_holidays_settings/odoo/__init__.py b/setup/hr_holidays_settings/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_holidays_settings/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_holidays_settings/odoo/addons/__init__.py b/setup/hr_holidays_settings/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_holidays_settings/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_holidays_settings/odoo/addons/hr_holidays_settings b/setup/hr_holidays_settings/odoo/addons/hr_holidays_settings new file mode 120000 index 000000000000..1e6ff6b99a6b --- /dev/null +++ b/setup/hr_holidays_settings/odoo/addons/hr_holidays_settings @@ -0,0 +1 @@ +../../../../hr_holidays_settings \ No newline at end of file diff --git a/setup/hr_holidays_settings/setup.py b/setup/hr_holidays_settings/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_holidays_settings/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_skill/odoo/__init__.py b/setup/hr_skill/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_skill/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_skill/odoo/addons/__init__.py b/setup/hr_skill/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_skill/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_skill/odoo/addons/hr_skill b/setup/hr_skill/odoo/addons/hr_skill new file mode 120000 index 000000000000..40ba2b3ae924 --- /dev/null +++ b/setup/hr_skill/odoo/addons/hr_skill @@ -0,0 +1 @@ +../../../../hr_skill \ No newline at end of file diff --git a/setup/hr_skill/setup.py b/setup/hr_skill/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_skill/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/hr_worked_days_from_timesheet/odoo/__init__.py b/setup/hr_worked_days_from_timesheet/odoo/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_worked_days_from_timesheet/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_worked_days_from_timesheet/odoo/addons/__init__.py b/setup/hr_worked_days_from_timesheet/odoo/addons/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/setup/hr_worked_days_from_timesheet/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/hr_worked_days_from_timesheet/odoo/addons/hr_worked_days_from_timesheet b/setup/hr_worked_days_from_timesheet/odoo/addons/hr_worked_days_from_timesheet new file mode 120000 index 000000000000..0e73a4017888 --- /dev/null +++ b/setup/hr_worked_days_from_timesheet/odoo/addons/hr_worked_days_from_timesheet @@ -0,0 +1 @@ +../../../../hr_worked_days_from_timesheet \ No newline at end of file diff --git a/setup/hr_worked_days_from_timesheet/setup.py b/setup/hr_worked_days_from_timesheet/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/hr_worked_days_from_timesheet/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)