Skip to content

Commit

Permalink
Merge PR #1288 into 14.0
Browse files Browse the repository at this point in the history
Signed-off-by etobella
  • Loading branch information
OCA-git-bot committed Oct 30, 2023
2 parents 5945120 + bdfb0b3 commit 4700db8
Show file tree
Hide file tree
Showing 23 changed files with 60 additions and 73 deletions.
6 changes: 2 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2
_commit: v1.17.2
_src_path: gh:oca/oca-addons-repo-template
ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand All @@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
Expand All @@ -19,6 +19,4 @@ repo_description: Set of general modules related to HR management
repo_name: HR modules
repo_slug: hr
repo_website: https://github.com/OCA/hr
travis_apt_packages: []
travis_apt_sources: []

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly

# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
Expand All @@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand All @@ -36,10 +36,10 @@ jobs:
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB
makepot: "true"
services:
postgres:
image: postgres:9.6
Expand All @@ -50,7 +50,7 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
Expand Down
16 changes: 15 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -33,12 +35,24 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
rev: 969238e47c07d0c40573acff81d170f63245d738
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://github.com/OCA/hr"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=hr
- --if-source-changed
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
Expand Down
9 changes: 0 additions & 9 deletions hr_course/i18n/hr_course.pot
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ msgstr ""
#: model:ir.actions.act_window,name:hr_course.open_view_course_category_form
#: model:ir.ui.menu,name:hr_course.menu_view_course_category_form
#: model_terms:ir.ui.view,arch_db:hr_course.view_course_category_form
#: model_terms:ir.ui.view,arch_db:hr_course.view_course_category_list
#: model_terms:ir.ui.view,arch_db:hr_course.view_course_category_search
msgid "Course Categories"
msgstr ""
Expand Down Expand Up @@ -407,9 +406,7 @@ msgstr ""

#. module: hr_course
#: model:ir.model.fields,help:hr_course.field_hr_course__message_has_error
#: model:ir.model.fields,help:hr_course.field_hr_course__message_has_sms_error
#: model:ir.model.fields,help:hr_course.field_hr_course_schedule__message_has_error
#: model:ir.model.fields,help:hr_course.field_hr_course_schedule__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -608,12 +605,6 @@ msgstr ""
msgid "Result"
msgstr ""

#. module: hr_course
#: model:ir.model.fields,field_description:hr_course.field_hr_course__message_has_sms_error
#: model:ir.model.fields,field_description:hr_course.field_hr_course_schedule__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: hr_course
#: model_terms:ir.ui.view,arch_db:hr_course.hr_course_form_view
msgid "Schedules"
Expand Down
2 changes: 1 addition & 1 deletion hr_course/views/hr_course_category_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<field name="model">hr.course.category</field>
<field eval="8" name="priority" />
<field name="arch" type="xml">
<tree string="Course Categories">
<tree>
<field name="name" />
</tree>
</field>
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_id/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ msgstr "Le numéro d'employé doit être unique par société(s)."
#: code:addons/hr_employee_id/models/hr_employee.py:0
#, fuzzy, python-format
msgid "Unable to generate unique Employee ID in %d steps."
msgstr "Impossible de générer le numéro d'ID employé qui doit être unique."
msgstr ""

#~ msgid ""
#~ "<span>(*) This configuration is related to the company you're logged into."
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_id/i18n/hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ msgstr "Šifra djelatnika mora biti jedinstvena unutar(između) poduzeća"
#: code:addons/hr_employee_id/models/hr_employee.py:0
#, fuzzy, python-format
msgid "Unable to generate unique Employee ID in %d steps."
msgstr "Nije moguće generirati jedinstvenu šifru djelatnika."
msgstr ""

#~ msgid ""
#~ "<span>(*) This configuration is related to the company you're logged into."
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_id/i18n/hr_HR.po
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ msgstr "ID broj djelatnika mora biti jedinstven za poduzeće(a)."
#: code:addons/hr_employee_id/models/hr_employee.py:0
#, fuzzy, python-format
msgid "Unable to generate unique Employee ID in %d steps."
msgstr "Nije moguće generiranje jedinstvenog ID djelatnika."
msgstr ""

#~ msgid ""
#~ "<span>(*) This configuration is related to the company you're logged into."
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_id/i18n/nl_NL.po
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ msgstr "Het Personeelsnummer moet uniek zijn binnen elk bedrijf en bedrijven."
#: code:addons/hr_employee_id/models/hr_employee.py:0
#, fuzzy, python-format
msgid "Unable to generate unique Employee ID in %d steps."
msgstr "Niet in staat om een uniek personeelsnummer te genereren."
msgstr ""

#~ msgid ""
#~ "<span>(*) This configuration is related to the company you're logged into."
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_id/i18n/sl.po
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ msgstr "Številka kadra mora biti unikatna v sklopu družbe (družb)."
#: code:addons/hr_employee_id/models/hr_employee.py:0
#, fuzzy, python-format
msgid "Unable to generate unique Employee ID in %d steps."
msgstr "Ni možno ustvariti ID številke kadra, ki bi bila unikatna."
msgstr ""

#~ msgid "Created by"
#~ msgstr "Ustvaril"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ msgstr ""

#. module: hr_employee_medical_examination
#: model:ir.model.fields,help:hr_employee_medical_examination.field_hr_employee_medical_examination__message_has_error
#: model:ir.model.fields,help:hr_employee_medical_examination.field_hr_employee_medical_examination__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -387,11 +386,6 @@ msgstr ""
msgid "Result"
msgstr ""

#. module: hr_employee_medical_examination
#: model:ir.model.fields,field_description:hr_employee_medical_examination.field_hr_employee_medical_examination__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: hr_employee_medical_examination
#: model:ir.model.fields,field_description:hr_employee_medical_examination.field_hr_employee_medical_examination__state
msgid "State"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<odoo noupdate="1">
<record id="hr_medical_examination_rule_base" model="ir.rule">
<field name="name">Base User: Only own examinations</field>
<field
name="model_id"
ref="hr_employee_medical_examination.model_hr_employee_medical_examination"
/>
name="model_id"
ref="hr_employee_medical_examination.model_hr_employee_medical_examination"
/>
<field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
</record>
<record id="hr_medical_examination_rule_manager" model="ir.rule">
<field name="name">Manager: All Examinations</field>
<field
name="model_id"
ref="hr_employee_medical_examination.model_hr_employee_medical_examination"
/>
name="model_id"
ref="hr_employee_medical_examination.model_hr_employee_medical_examination"
/>
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(6, 0, [ref('hr.group_hr_manager')])]" />
</record>
</data>
</odoo>
4 changes: 1 addition & 3 deletions hr_employee_relative/data/data_relative_relation.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<odoo noupdate="1">
<!--
Copyright (C) 2018 Brainbean Apps (https://brainbeanapps.com)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
Expand Down Expand Up @@ -30,5 +29,4 @@
<record model="hr.employee.relative.relation" id="relation_grandchild">
<field name="name">Grandchild</field>
</record>
</data>
</odoo>
5 changes: 0 additions & 5 deletions hr_employee_relative/i18n/hr_employee_relative.pot
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ msgstr ""
msgid "Employee"
msgstr ""

#. module: hr_employee_relative
#: model_terms:ir.ui.view,arch_db:hr_employee_relative.hr_employee_relative_view_tree
msgid "Employee Relatives"
msgstr ""

#. module: hr_employee_relative
#: model:ir.model.fields.selection,name:hr_employee_relative.selection__hr_employee_relative__gender__female
msgid "Female"
Expand Down
2 changes: 1 addition & 1 deletion hr_employee_relative/views/hr_employee_relative.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<field name="name">hr.employee.relative.view.tree</field>
<field name="model">hr.employee.relative</field>
<field name="arch" type="xml">
<tree string="Employee Relatives" editable="bottom">
<tree editable="bottom">
<field name="relation_id" />
<field name="name" />
<field name="partner_id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ odoo.define("hr_org_chart_overview", function (require) {

_onClickNode: function (ev) {
ev.preventDefault();
this._openEmployeeFormView(parseInt(ev.currentTarget.id));
this._openEmployeeFormView(parseInt(ev.currentTarget.id, 10));
},

_onPrintPDF: function (ev) {
Expand Down
12 changes: 5 additions & 7 deletions hr_org_chart_overview/views/hr_views.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>
<record id="action_org_chart_overview" model="ir.actions.client">
<field name="name">Organizational Chart</field>
<field name="tag">hr_org_chart_overview</field>
<field name="target">main</field>
</record>
<menuitem
parent="hr.hr_menu_hr_reports"
id="menu_org_chart_overview_report"
action="action_org_chart_overview"
sequence="1"
/>
</data>
parent="hr.hr_menu_hr_reports"
id="menu_org_chart_overview_report"
action="action_org_chart_overview"
sequence="1"
/>
</odoo>
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,6 @@ msgstr ""
msgid "Employee Personal Equipment"
msgstr ""

#. module: hr_personal_equipment_request
#: model_terms:ir.ui.view,arch_db:hr_personal_equipment_request.hr_personal_equipment_tree_view
msgid "Employee Personal Equipments"
msgstr ""

#. module: hr_personal_equipment_request
#: code:addons/hr_personal_equipment_request/models/hr_employee.py:0
#: model:ir.model.fields,field_description:hr_personal_equipment_request.field_hr_employee__equipment_request_ids
Expand Down Expand Up @@ -246,9 +241,7 @@ msgstr ""

#. module: hr_personal_equipment_request
#: model:ir.model.fields,help:hr_personal_equipment_request.field_hr_personal_equipment__message_has_error
#: model:ir.model.fields,help:hr_personal_equipment_request.field_hr_personal_equipment__message_has_sms_error
#: model:ir.model.fields,help:hr_personal_equipment_request.field_hr_personal_equipment_request__message_has_error
#: model:ir.model.fields,help:hr_personal_equipment_request.field_hr_personal_equipment_request__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -437,12 +430,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""

#. module: hr_personal_equipment_request
#: model:ir.model.fields,field_description:hr_personal_equipment_request.field_hr_personal_equipment__message_has_sms_error
#: model:ir.model.fields,field_description:hr_personal_equipment_request.field_hr_personal_equipment_request__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: hr_personal_equipment_request
#: model:ir.model.fields,field_description:hr_personal_equipment_request.field_hr_personal_equipment__start_date
msgid "Start Date"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
<field name="model">hr.personal.equipment</field>
<field name="arch" type="xml">
<tree
string="Employee Personal Equipments"
create="0"
decoration-info="state=='accepted'"
decoration-success="state=='valid'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ msgstr ""
msgid "Validated Message"
msgstr ""

#. module: hr_personal_equipment_request_tier_validation
#: model:ir.model.fields,field_description:hr_personal_equipment_request_tier_validation.field_hr_personal_equipment_request__validation_status
msgid "Validation Status"
msgstr ""

#. module: hr_personal_equipment_request_tier_validation
#: model:ir.model.fields,field_description:hr_personal_equipment_request_tier_validation.field_hr_personal_equipment_request__review_ids
msgid "Validations"
Expand Down
4 changes: 1 addition & 3 deletions hr_recruitment_notification/data/message_subtypes.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2021 Tecnativa - João Marques -->
<odoo>
<data noupdate="1">
<odoo noupdate="1">
<!-- Message Subtype related to Job Positions -->
<record id="mt_hr_applicant_new" model="mail.message.subtype">
<field name="name">New Applicant</field>
Expand All @@ -11,5 +10,4 @@
<field name="parent_id" ref="hr_recruitment.mt_applicant_new" />
<field name="relation_field">job_id</field>
</record>
</data>
</odoo>

0 comments on commit 4700db8

Please sign in to comment.