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.

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

14.0 t000970 #16

Open
wants to merge 3 commits into
base: 14.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
path: ~/.cache/pre-commit
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ addons:
apt:
packages:
- expect-dev # provides unbuffer utility
- swig
- python3-pykcs11

stages:
- test
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ssi_hr_employee/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions ssi_hr_employee/models/hr_employee.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions ssi_hr_employee/views/hr_employee_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<xpath expr="//field[@name='job_id']" position="before">
<field name="date_join" />
<field name="date_termination" />
<field name="date_permanent" />
<label for="year_work_longetivity" string="Work Longetivity" />
<div>
<field name="year_work_longetivity" class="oe_inline" /> Years
Expand Down