diff --git a/.copier-answers.yml b/.copier-answers.yml index cdeb317..9bb86e8 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: edb24fc +_commit: 9bee604 _src_path: gh:open-synergy/ssi-addons-repo-template dependency_installation_mode: OCA generate_requirements_txt: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 57d6691..3a6b6ed 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -6,10 +6,13 @@ on: jobs: pre-commit: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 + - name: Get python version + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + - uses: actions/cache@v1 with: - python-version: "3.9.7" - - uses: pre-commit/action@v2.0.0 + path: ~/.cache/pre-commit + key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index adade37..923010c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -112,7 +112,7 @@ repos: - requirements.txt - --header - "# generated from manifests external_dependencies" - - repo: https://gitlab.com/PyCQA/flake8 + - repo: https://github.com/PyCQA/flake8 rev: 3.9.2 hooks: - id: flake8 diff --git a/.travis.yml b/.travis.yml index 577d2c4..2bfbea6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ addons: apt: packages: - expect-dev # provides unbuffer utility + - swig + - python3-pykcs11 stages: - test @@ -29,11 +31,11 @@ env: - VERSION="14.0" TESTS="0" LINT_CHECK="0" MAKEPOT="1" install: - - git clone --depth=1 - https://github.com/simetri-sinergi-id/maintainer-quality-tools.git + - git clone --depth=1 https://github.com/akretion/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly + - pip install PyPDF2==1.26.0 script: - travis_run_tests diff --git a/ssi_hr_employee/__manifest__.py b/ssi_hr_employee/__manifest__.py index 06565e7..94b38f9 100644 --- a/ssi_hr_employee/__manifest__.py +++ b/ssi_hr_employee/__manifest__.py @@ -4,7 +4,7 @@ # pylint: disable=locally-disabled, manifest-required-author { "name": "HR Employee", - "version": "14.0.2.4.0", + "version": "14.0.2.5.0", "website": "https://simetri-sinergi.id", "author": "PT. Simetri Sinergi Indonesia, OpenSynergy Indonesia", "license": "AGPL-3", diff --git a/ssi_hr_employee/models/hr_employee.py b/ssi_hr_employee/models/hr_employee.py index 33e9da4..69b2f78 100644 --- a/ssi_hr_employee/models/hr_employee.py +++ b/ssi_hr_employee/models/hr_employee.py @@ -98,6 +98,9 @@ def _get_domain_department(self): date_termination = fields.Date( string="Termination Date", ) + date_permanent = fields.Date( + string="Permanent Date", + ) year_work_longetivity = fields.Integer( string="Year Work Longetivity", compute="_compute_work_longetivity", diff --git a/ssi_hr_employee/views/hr_employee_views.xml b/ssi_hr_employee/views/hr_employee_views.xml index 1c4184d..42cd055 100644 --- a/ssi_hr_employee/views/hr_employee_views.xml +++ b/ssi_hr_employee/views/hr_employee_views.xml @@ -27,6 +27,7 @@ +