diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1c6434bfc2274c73d98dbf62b6de9baccdc353ce..732d0c4a644eb444d6b4385643ff32fab19fab52 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,8 +6,6 @@ exclude: |
^setup/|/static/description/index\.html$|
# We don't want to mess with tool-generated files
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
- # Maybe reactivate this when all README files include prettier ignore tags?
- ^README\.md$|
# Library files can have extraneous formatting (even minimized)
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
@@ -28,7 +26,7 @@ repos:
language: fail
files: "\\.rej$"
- repo: https://github.com/oca/maintainer-tools
- rev: ab1d7f6
+ rev: 7d8a9f9ad73db0976fb03cbee43d953bc29b89e9
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
@@ -46,11 +44,11 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
- rev: 20.8b1
+ rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
- rev: v2.1.2
+ rev: v2.6.2
hooks:
- id: prettier
name: prettier (with plugin-xml)
@@ -61,7 +59,7 @@ repos:
- --plugin=@prettier/plugin-xml
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
- repo: https://github.com/pre-commit/mirrors-eslint
- rev: v7.8.1
+ rev: v8.15.0
hooks:
- id: eslint
verbose: true
@@ -69,7 +67,7 @@ repos:
- --color
- --fix
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v3.2.0
+ rev: v4.2.0
hooks:
- id: trailing-whitespace
# exclude autogenerated files
@@ -91,12 +89,12 @@ repos:
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
- rev: v2.7.2
+ rev: v2.32.1
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
- rev: 5.5.1
+ rev: 5.10.1
hooks:
- id: isort
name: isort except __init__.py
@@ -104,13 +102,13 @@ repos:
- --settings=.
exclude: /__init__\.py$
- repo: https://gitlab.com/PyCQA/flake8
- rev: 3.8.3
+ rev: 3.9.2
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/pylint
- rev: pylint-2.5.3
+ rev: v2.11.1
hooks:
- id: pylint
name: pylint with optional checks
@@ -119,7 +117,7 @@ repos:
- --exit-zero
verbose: true
additional_dependencies: &pylint_deps
- - pylint-odoo==3.5.0
+ - pylint-odoo==5.0.5
- id: pylint
name: pylint with mandatory checks
args:
diff --git a/views/cgscop_timesheet_sheet.xml b/views/cgscop_timesheet_sheet.xml
index 12a0425836c2b1cecd8d4628d1b31d938bd4a982..df3eb19ac9476d34ae422c6a38d794b46c2337ee 100644
--- a/views/cgscop_timesheet_sheet.xml
+++ b/views/cgscop_timesheet_sheet.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
+ <data>
<!--
Vues
-->
@@ -30,60 +31,60 @@
<field name="company_id" invisible="1" />
<header>
<button
- name="action_submit_timesheet"
- states="draft"
- string="Soumettre"
- type="object"
- class="oe_highlight"
- />
+ name="action_submit_timesheet"
+ states="draft"
+ string="Soumettre"
+ type="object"
+ class="oe_highlight"
+ />
<button
- name="approve_timesheet_sheets"
- states="submit"
- string="Valider"
- type="object"
- groups="hr_timesheet.group_timesheet_manager"
- class="oe_highlight"
- />
+ name="approve_timesheet_sheets"
+ states="submit"
+ string="Valider"
+ type="object"
+ groups="hr_timesheet.group_timesheet_manager"
+ class="oe_highlight"
+ />
<button
- name="print_timesheet"
- string="Imprimer"
- type="object"
- />
+ name="print_timesheet"
+ string="Imprimer"
+ type="object"
+ />
<button
- name="reset_timesheet_sheets"
- string="Remettre en brouillon"
- type="object"
- attrs="{'invisible': [('state', '=', 'draft')]}"
- groups="hr_timesheet.group_timesheet_manager"
- />
+ name="reset_timesheet_sheets"
+ string="Remettre en brouillon"
+ type="object"
+ attrs="{'invisible': [('state', '=', 'draft')]}"
+ groups="hr_timesheet.group_timesheet_manager"
+ />
<field
- name="state"
- widget="statusbar"
- statusbar_visible="draft,submit,valid"
- />
+ name="state"
+ widget="statusbar"
+ statusbar_visible="draft,submit,valid"
+ />
</header>
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only" />
<h1>
<field
- name="name"
- attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}"
- />
+ name="name"
+ attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}"
+ />
</h1>
</div>
<group>
<group>
<field
- name="employee_id"
- groups="hr_timesheet.group_timesheet_manager"
- options="{'no_open': True, 'no_create': True}"
- />
+ name="employee_id"
+ groups="hr_timesheet.group_timesheet_manager"
+ options="{'no_open': True, 'no_create': True}"
+ />
<field
- name="company_id"
- groups="base.group_multi_company"
- options="{'no_open': True, 'no_create': True}"
- />
+ name="company_id"
+ groups="base.group_multi_company"
+ options="{'no_open': True, 'no_create': True}"
+ />
</group>
<group>
<field name="create_date" readonly="1" />
@@ -94,13 +95,13 @@
</group>
<field name="can_edit" invisible="1" />
<field
- name="timesheet_line_ids"
- widget="many2many"
- domain="[('sheet_id', '=', False), ('employee_id', '=', employee_id)]"
- options="{'reload_on_button': True}"
- attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}"
- context="{'form_view_ref' : 'hr_timesheet.timesheet_view_form_user'}"
- >
+ name="timesheet_line_ids"
+ widget="many2many"
+ domain="[('sheet_id', '=', False), ('employee_id', '=', employee_id)]"
+ options="{'reload_on_button': True}"
+ attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}"
+ context="{'form_view_ref' : 'hr_timesheet.timesheet_view_form_user'}"
+ >
<tree editable="top">
<field name="company_id" invisible="1" />
<field name="ur_id" invisible="1" />
@@ -109,30 +110,34 @@
<field name="state" invisible="1" />
<field name="sheet_id" invisible="1" />
<field
- name="project_id"
- options="{'no_open': True, 'no_create': True}"
- />
+ name="project_id"
+ options="{'no_open': True, 'no_create': True}"
+ />
<field
- name="partner_id"
- options="{'no_open': True, 'no_create': True}"
- />
+ name="partner_id"
+ options="{'no_open': True, 'no_create': True}"
+ />
<field name="name" />
<field name="unit_amount" widget="float_time" />
<field
- name="ur_financial_system_id"
- options="{'no_open': True, 'no_create': True}"
- />
+ name="ur_financial_system_id"
+ options="{'no_open': True, 'no_create': True}"
+ />
<field
- name="justificatifs"
- attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"
- />
+ name="justificatifs"
+ attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"
+ />
</tree>
</field>
</sheet>
<div class="oe_chatter">
- <field name="message_follower_ids" options="{'post_refresh':True}" groups="base.group_user"/>
- <field name="activity_ids"/>
- <field name="message_ids"/>
+ <field
+ name="message_follower_ids"
+ options="{'post_refresh':True}"
+ groups="base.group_user"
+ />
+ <field name="activity_ids" />
+ <field name="message_ids" />
</div>
</form>
</field>
@@ -149,46 +154,46 @@
<separator />
<field name="employee_id" />
<filter
- string="Mes feuilles de temps"
- name="my_reports"
- domain="[('employee_id.user_id', '=', uid)]"
- />
+ string="Mes feuilles de temps"
+ name="my_reports"
+ domain="[('employee_id.user_id', '=', uid)]"
+ />
<filter
- string="Mon équipe"
- name="my_team_reports"
- domain="[('employee_id.parent_id.user_id', '=', uid)]"
- groups="hr_timesheet.group_timesheet_manager"
- help="Expenses of Your Team Member"
- />
+ string="Mon équipe"
+ name="my_team_reports"
+ domain="[('employee_id.parent_id.user_id', '=', uid)]"
+ groups="hr_timesheet.group_timesheet_manager"
+ help="Expenses of Your Team Member"
+ />
<separator />
<filter
- domain="[('state', '=', 'draft')]"
- string="Brouillon"
- name="draft"
- />
+ domain="[('state', '=', 'draft')]"
+ string="Brouillon"
+ name="draft"
+ />
<filter
- domain="[('state', '=', 'submit')]"
- string="Soumis"
- name="submitted"
- />
+ domain="[('state', '=', 'submit')]"
+ string="Soumis"
+ name="submitted"
+ />
<filter
- domain="[('state', '=', 'valid')]"
- string="Validé"
- name="valid"
- />
+ domain="[('state', '=', 'valid')]"
+ string="Validé"
+ name="valid"
+ />
<group expand="0" string="Group By">
<filter
- string="Employé"
- name="employee"
- domain="[]"
- context="{'group_by': 'employee_id'}"
- />
+ string="Employé"
+ name="employee"
+ domain="[]"
+ context="{'group_by': 'employee_id'}"
+ />
<filter
- string="Statut"
- domain="[]"
- context="{'group_by': 'state'}"
- name="state"
- />
+ string="Statut"
+ domain="[]"
+ context="{'group_by': 'state'}"
+ name="state"
+ />
</group>
</search>
</field>
@@ -209,9 +214,9 @@
</record>
<record
- id="action_cgscop_timesheet_sheet_to_approve"
- model="ir.actions.act_window"
- >
+ id="action_cgscop_timesheet_sheet_to_approve"
+ model="ir.actions.act_window"
+ >
<field name="name">Feuilles de temps à valider</field>
<field name="res_model">cgscop.timesheet.sheet</field>
<field name="view_mode">tree,form</field>
@@ -225,7 +230,7 @@
<field name="res_model">cgscop.timesheet.sheet</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_cgscop_timesheet_sheet_filter" />
- <field name="domain">[('ur_id', '=', ur_id)]</field>
+ <field name="domain">[('company_id', '=', allowed_company_ids[0])]</field>
<field name="context">{}</field>
</record>
@@ -236,36 +241,36 @@
-->
<menuitem
- id="timesheet_sheet_menu"
- parent="hr_timesheet.timesheet_menu_root"
- name="Feuilles de temps"
- sequence="25"
- />
+ id="timesheet_sheet_menu"
+ parent="hr_timesheet.timesheet_menu_root"
+ name="Feuilles de temps"
+ sequence="25"
+ />
<menuitem
- id="menu_hr_timesheet_my_timesheet"
- name="Mes feuilles de temps"
- sequence="1"
- action="cgscop_timesheet.action_cgscop_timesheet_sheet_my_all"
- parent="cgscop_timesheet.timesheet_sheet_menu"
- />
+ id="menu_hr_timesheet_my_timesheet"
+ name="Mes feuilles de temps"
+ sequence="1"
+ action="cgscop_timesheet.action_cgscop_timesheet_sheet_my_all"
+ parent="cgscop_timesheet.timesheet_sheet_menu"
+ />
<menuitem
- id="menu_hr_timesheet_to_approve"
- name="À valider"
- sequence="1"
- action="cgscop_timesheet.action_cgscop_timesheet_sheet_to_approve"
- parent="cgscop_timesheet.timesheet_sheet_menu"
- groups="hr_timesheet.group_timesheet_manager"
- />
+ id="menu_hr_timesheet_to_approve"
+ name="À valider"
+ sequence="1"
+ action="cgscop_timesheet.action_cgscop_timesheet_sheet_to_approve"
+ parent="cgscop_timesheet.timesheet_sheet_menu"
+ groups="hr_timesheet.group_timesheet_manager"
+ />
<menuitem
- id="menu_hr_timesheet_all"
- name="Toutes les feuilles de temps"
- sequence="1"
- action="cgscop_timesheet.action_cgscop_timesheet_sheet_all"
- parent="cgscop_timesheet.timesheet_sheet_menu"
- groups="hr_timesheet.group_timesheet_manager"
- />
-
+ id="menu_hr_timesheet_all"
+ name="Toutes les feuilles de temps"
+ sequence="1"
+ action="cgscop_timesheet.action_cgscop_timesheet_sheet_all"
+ parent="cgscop_timesheet.timesheet_sheet_menu"
+ groups="hr_timesheet.group_timesheet_manager"
+ />
+ </data>
</odoo>
diff --git a/views/hr_timesheet.xml b/views/hr_timesheet.xml
index eb3361f2ee20ec321d08f828a8c398950c2081b0..528eee4de93e3609d74e74d82dac393a61dc9436 100644
--- a/views/hr_timesheet.xml
+++ b/views/hr_timesheet.xml
@@ -325,11 +325,14 @@
name="context"
>{'search_default_no_report': 1, 'search_default_groupby_date': 1}</field>
</record>
- <record id="act_hr_timesheet_line_view_calendar" model="ir.actions.act_window.view">
+ <record
+ id="act_hr_timesheet_line_view_calendar"
+ model="ir.actions.act_window.view"
+ >
<field name="view_mode">calendar</field>
- <field name="sequence" eval="5"/>
- <field name="view_id" ref="view_cgscop_hr_timesheet_line_calendar"/>
- <field name="act_window_id" ref="hr_timesheet.act_hr_timesheet_line"/>
+ <field name="sequence" eval="5" />
+ <field name="view_id" ref="view_cgscop_hr_timesheet_line_calendar" />
+ <field name="act_window_id" ref="hr_timesheet.act_hr_timesheet_line" />
</record>
<!-- Hérite l'action de la fenetre dans hr_timesheet -->
diff --git a/views/hr_timesheet_cgscop.xml b/views/hr_timesheet_cgscop.xml
index 63bb233274e935efb9b533198ada67ba77f93b96..fafaa0766a55112350b9738d4330ab4b04e67fa5 100644
--- a/views/hr_timesheet_cgscop.xml
+++ b/views/hr_timesheet_cgscop.xml
@@ -100,8 +100,12 @@
</sheet>
<div class="oe_chatter">
- <field name="message_follower_ids" options="{'post_refresh':True}" groups="base.group_user"/>
- <field name="message_ids"/>
+ <field
+ name="message_follower_ids"
+ options="{'post_refresh':True}"
+ groups="base.group_user"
+ />
+ <field name="message_ids" />
</div>
</form>
</field>