Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[14.0] dotfiles #139

Merged
merged 3 commits into from
Jan 5, 2024
Merged

[14.0] dotfiles #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4912779
[IMP] update dotfiles
OCA-git-bot Oct 27, 2023
a83859f
[UPD] Update payroll.pot
Oct 27, 2023
838e4e6
[FIX] all: fix pre-commit new checks
aleuffre Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .copier-answers.yml
View file
Open in desktop
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: true
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: Addons to manage your Payroll in Odoo
repo_name: Addons to manage your Payroll in Odoo
repo_slug: payroll
repo_website: https://github.com/OCA/payroll
travis_apt_packages: []
travis_apt_sources: []

1 change: 1 addition & 0 deletions .eslintrc.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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/payroll"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=payroll
- --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
22 changes: 10 additions & 12 deletions payroll/data/hr_payroll_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<!-- Decimal Precision -->
<record forcecreate="True" id="decimal_payroll" model="decimal.precision">
<field name="name">Payroll</field>
<field name="digits">2</field>
</record>
<record forcecreate="True" id="decimal_payroll_rate" model="decimal.precision">
<field name="name">Payroll Rate</field>
<field name="digits">4</field>
</record>
</data>
<odoo noupdate="1">
<!-- Decimal Precision -->
<record forcecreate="True" id="decimal_payroll" model="decimal.precision">
<field name="name">Payroll</field>
<field name="digits">2</field>
</record>
<record forcecreate="True" id="decimal_payroll_rate" model="decimal.precision">
<field name="name">Payroll Rate</field>
<field name="digits">4</field>
</record>
</odoo>
16 changes: 7 additions & 9 deletions payroll/data/hr_payroll_sequence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<record id="seq_salary_slip" model="ir.sequence">
<field name="name">Salary Slip</field>
<field name="code">salary.slip</field>
<field name="prefix">SLIP/</field>
<field name="padding">3</field>
</record>
</data>
<odoo noupdate="1">
<record id="seq_salary_slip" model="ir.sequence">
<field name="name">Salary Slip</field>
<field name="code">salary.slip</field>
<field name="prefix">SLIP/</field>
<field name="padding">3</field>
</record>
</odoo>
8 changes: 0 additions & 8 deletions payroll/i18n/payroll.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,9 +1154,7 @@ msgstr ""

#. module: payroll
#: model:ir.model.fields,help:payroll.field_hr_payslip__message_has_error
#: model:ir.model.fields,help:payroll.field_hr_payslip__message_has_sms_error
#: model:ir.model.fields,help:payroll.field_hr_payslip_run__message_has_error
#: model:ir.model.fields,help:payroll.field_hr_payslip_run__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -1931,12 +1929,6 @@ msgstr ""
msgid "Rule Configuration"
msgstr ""

#. module: payroll
#: model:ir.model.fields,field_description:payroll.field_hr_payslip__message_has_sms_error
#: model:ir.model.fields,field_description:payroll.field_hr_payslip_run__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: payroll
#: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_category_view_form
msgid "Salary Categories"
Expand Down
168 changes: 83 additions & 85 deletions payroll/security/hr_payroll_security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,85 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<record model="ir.module.category" id="module_category_payroll">
<field name="name">Payroll</field>
<field name="description">Manage employee payroll</field>
<field name="sequence">16</field>
</record>
<record id="group_payroll_user" model="res.groups">
<field name="name">Officer</field>
<field name="category_id" ref="module_category_payroll" />
<field
name="implied_ids"
eval="[(4, ref('hr.group_hr_user')), (4, ref('hr_contract.group_hr_contract_manager'))]"
/>
</record>
<record id="group_payroll_manager" model="res.groups">
<field name="name">Manager</field>
<field name="category_id" ref="module_category_payroll" />
<field name="implied_ids" eval="[(4, ref('payroll.group_payroll_user'))]" />
<field
name="users"
eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
/>
</record>
<record id="base.default_user" model="res.users">
<field name="groups_id" eval="[(4,ref('payroll.group_payroll_manager'))]" />
</record>
<record id="hr_payroll_rule_officer" model="ir.rule">
<field name="name">Officer and subordinates Payslip</field>
<field name="model_id" ref="model_hr_payslip" />
<field name="domain_force">
['|','|', ('employee_id.user_id', '=', user.id),
('employee_id.department_id', '=', False),
('employee_id.department_id.manager_id.user_id', '=', user.id)]
</field>
<field name="groups" eval="[(4, ref('payroll.group_payroll_user'))]" />
</record>
<record id="hr_payslip_rule_manager" model="ir.rule">
<field name="name">All Payslip</field>
<field name="model_id" ref="model_hr_payslip" />
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(4, ref('payroll.group_payroll_manager'))]" />
</record>
<!-- Company-restricted Records -->
<record model="ir.rule" id="hr_payslip_rule_company">
<field name="name">Payslip: multi-company</field>
<field name="model_id" ref="model_hr_payslip" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_payroll_structure_rule_company">
<field name="name">Payroll Structure: multi-company</field>
<field name="model_id" ref="model_hr_payroll_structure" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_salary_rule_company">
<field name="name">Salary Rule: multi-company</field>
<field name="model_id" ref="model_hr_salary_rule" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_salary_category_rule_company">
<field name="name">Salary Rule Category: multi-company</field>
<field name="model_id" ref="model_hr_salary_rule_category" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_contribution_register_rule_company">
<field name="name">Contribution Register: multi-company</field>
<field name="model_id" ref="model_hr_contribution_register" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
</data>
<odoo noupdate="1">
<record model="ir.module.category" id="module_category_payroll">
<field name="name">Payroll</field>
<field name="description">Manage employee payroll</field>
<field name="sequence">16</field>
</record>
<record id="group_payroll_user" model="res.groups">
<field name="name">Officer</field>
<field name="category_id" ref="module_category_payroll" />
<field
name="implied_ids"
eval="[(4, ref('hr.group_hr_user')), (4, ref('hr_contract.group_hr_contract_manager'))]"
/>
</record>
<record id="group_payroll_manager" model="res.groups">
<field name="name">Manager</field>
<field name="category_id" ref="module_category_payroll" />
<field name="implied_ids" eval="[(4, ref('payroll.group_payroll_user'))]" />
<field
name="users"
eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
/>
</record>
<record id="base.default_user" model="res.users">
<field name="groups_id" eval="[(4,ref('payroll.group_payroll_manager'))]" />
</record>
<record id="hr_payroll_rule_officer" model="ir.rule">
<field name="name">Officer and subordinates Payslip</field>
<field name="model_id" ref="model_hr_payslip" />
<field name="domain_force">
['|','|', ('employee_id.user_id', '=', user.id),
('employee_id.department_id', '=', False),
('employee_id.department_id.manager_id.user_id', '=', user.id)]
</field>
<field name="groups" eval="[(4, ref('payroll.group_payroll_user'))]" />
</record>
<record id="hr_payslip_rule_manager" model="ir.rule">
<field name="name">All Payslip</field>
<field name="model_id" ref="model_hr_payslip" />
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(4, ref('payroll.group_payroll_manager'))]" />
</record>
<!-- Company-restricted Records -->
<record model="ir.rule" id="hr_payslip_rule_company">
<field name="name">Payslip: multi-company</field>
<field name="model_id" ref="model_hr_payslip" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_payroll_structure_rule_company">
<field name="name">Payroll Structure: multi-company</field>
<field name="model_id" ref="model_hr_payroll_structure" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_salary_rule_company">
<field name="name">Salary Rule: multi-company</field>
<field name="model_id" ref="model_hr_salary_rule" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_salary_category_rule_company">
<field name="name">Salary Rule Category: multi-company</field>
<field name="model_id" ref="model_hr_salary_rule_category" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
<record model="ir.rule" id="hr_contribution_register_rule_company">
<field name="name">Contribution Register: multi-company</field>
<field name="model_id" ref="model_hr_contribution_register" />
<field name="global" eval="True" />
<field name="domain_force">
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
</field>
</record>
</odoo>
2 changes: 1 addition & 1 deletion payroll/views/hr_contribution_register_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<field name="name">hr.contribution.register.tree</field>
<field name="model">hr.contribution.register</field>
<field name="arch" type="xml">
<tree string="Contribution Registers">
<tree>
<field name="name" />
<field
name="company_id"
Expand Down
4 changes: 2 additions & 2 deletions payroll/views/hr_payroll_structure_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<field name="name">hr.payroll.structure.tree</field>
<field name="model">hr.payroll.structure</field>
<field name="arch" type="xml">
<tree string="Employee Function">
<tree>
<field name="name" />
<field name="code" />
<field name="rule_ids" />
Expand All @@ -21,7 +21,7 @@
<field name="model">hr.payroll.structure</field>
<field name="field_parent">children_ids</field>
<field name="arch" type="xml">
<tree string="Salary Structure">
<tree>
<field name="name" />
<field name="code" />
<field
Expand Down
Loading
Loading