From 4e7db36d61560d205bd97e47368e77396e2e1278 Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Mon, 28 Feb 2022 18:04:53 +0100
Subject: [PATCH] [MIG] Migration to 14.0 + add migration script
---
README.rst | 1 -
__init__.py | 3 +-
__manifest__.py | 13 +-
i18n/fr.po | 712 -------------------------
migration/14.0.1.0.0/post-migration.py | 46 ++
migration/14.0.1.0.0/pre-migration.py | 13 +
models/__init__.py | 1 -
models/cgscop_timesheet_code.py | 19 +-
models/cgscop_timesheet_sheet.py | 123 +++--
models/hr_timesheet.py | 214 ++++----
models/project.py | 25 +-
models/res_company.py | 12 +-
models/res_partner.py | 44 +-
models/ur_financial_system.py | 20 +-
models/ur_month_timesheet.py | 107 ++--
models/ur_regional_convention.py | 20 +-
report/report_hr_timesheet.xml | 19 +-
security/security_rules.xml | 2 +-
static/description/icon.png | Bin 9161 -> 15890 bytes
views/cgscop_timesheet_sheet.xml | 13 +-
views/hr_timesheet.xml | 32 +-
views/hr_timesheet_cgscop.xml | 1 -
22 files changed, 422 insertions(+), 1018 deletions(-)
delete mode 100644 i18n/fr.po
create mode 100644 migration/14.0.1.0.0/post-migration.py
create mode 100644 migration/14.0.1.0.0/pre-migration.py
diff --git a/README.rst b/README.rst
index 8f9d24e..ad95403 100644
--- a/README.rst
+++ b/README.rst
@@ -14,7 +14,6 @@ Il ajoute les éléments suivants :
* menu pour configurer les projets (cf Codes Activité UR) et les vues associées
* table de configuration des activités CG
* table de configuration des dispositifs
-*
Credits
diff --git a/__init__.py b/__init__.py
index 31660d6..d997a09 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,3 +1,4 @@
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+# © 2019 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import models
diff --git a/__manifest__.py b/__manifest__.py
index 6f5230c..7340113 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -1,8 +1,9 @@
+# © 2019 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "CG SCOP - Feuille de temps",
"summary": "CG SCOP - Feuille de temps",
- "version": "12.0.1.2.0",
- "development_status": "Production/Stable",
+ "version": "14.0.1.0.0",
"author": "Le Filament",
"license": "AGPL-3",
"application": False,
@@ -11,7 +12,7 @@
"analytic",
"project",
"cgscop_partner",
- 'cgscop_fullcalendar',
+ "cgscop_fullcalendar",
],
"data": [
"security/ir.model.access.csv",
@@ -29,9 +30,9 @@
"report/report_hr_timesheet.xml",
"datas/cgscop_timesheet_code_data.xml",
],
- 'qweb': [
- 'static/src/xml/*.xml',
+ "qweb": [
+ "static/src/xml/*.xml",
],
"installable": True,
- 'auto_install': False,
+ "auto_install": False,
}
diff --git a/i18n/fr.po b/i18n/fr.po
deleted file mode 100644
index 2eb3d89..0000000
--- a/i18n/fr.po
+++ /dev/null
@@ -1,712 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * cgscop_timesheet
-# * hr_timesheet
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-18 18:07+0000\n"
-"PO-Revision-Date: 2020-02-18 18:07+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "(Un)archiving a project automatically (un)archives its tasks. Do you want to proceed?"
-msgstr "(Dés)archiver un projet (dés)archivera automatiquement ses tâches. Voulez-vous continuer? "
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "- Brouillon"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<span>Code activité UR</span>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<span>Contact</span>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<span>Date</span>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<span>Dispositif</span>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<span>Durée</span>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<strong>Employé</strong>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<strong>Soumis le</strong>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<strong>Total</strong>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "<strong>Validé le</strong>"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.cgscop_hr_timesheet_line_search
-msgid "A soumettre"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_needaction
-msgid "Action Needed"
-msgstr "Nécessite une action"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__activity_ids
-msgid "Activities"
-msgstr "Activités"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__activity_state
-msgid "Activity State"
-msgstr "Status de l'Activité"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.actions.act_window,help:cgscop_timesheet.action_cgscop_timesheet_code_tree
-msgid "Affiche et gère les Codes activité Nationaux"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model,name:cgscop_timesheet.model_account_analytic_line
-msgid "Analytic Line"
-msgstr "Ligne analytique"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_filter
-msgid "Archived"
-msgstr "Archivé"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_attachment_count
-msgid "Attachment Count"
-msgstr "Nombre de pièces jointes"
-
-#. module: cgscop_timesheet
-#: selection:account.analytic.line,state:0
-#: selection:cgscop.timesheet.sheet,state:0
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Brouillon"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__can_edit
-msgid "Can Reset"
-msgstr "Peut éditer"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "Cette feuille de temps a été éditée en brouillon."
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_account_analytic_line__cgscop_timesheet_code_id
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_project_project__cgscop_timesheet_code_id
-msgid "Code Activité National"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_kanban
-msgid "Code activité CG"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model,name:cgscop_timesheet.model_cgscop_timesheet_code
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_filter
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Code activité National"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.cgscop_hr_timesheet_line_search
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_hr_timesheet_line_form
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_hr_timesheet_line_pivot
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_hr_timesheet_line_tree
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_filter
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_kanban
-msgid "Code activité UR"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.actions.act_window,name:cgscop_timesheet.action_cgscop_timesheet_code_tree
-#: model:ir.ui.menu,name:cgscop_timesheet.menu_cgscop_timesheet_code
-msgid "Codes Activité National"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.ui.menu,name:cgscop_timesheet.menu_action_project_lines_tree
-msgid "Codes Activité UR"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.actions.act_window,name:cgscop_timesheet.act_cgscop_project_timesheet
-msgid "Codes activités UR"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__company_id
-msgid "Company"
-msgstr "Société"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Configuration"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.cgscop_hr_timesheet_line_search
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_hr_timesheet_line_form
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_hr_timesheet_line_pivot
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_hr_timesheet_line_tree
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_kanban
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_tree
-msgid "Contact"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_filter
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Contact par défaut"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Contact par défaut auquel est rattaché cette activité. Ce contact sera sélectionné automatiquement dans les feuilles de temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code__create_uid
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__create_uid
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__create_uid
-msgid "Created by"
-msgstr "Créé par"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code__create_date
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__create_date
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__create_date
-msgid "Created on"
-msgstr "Créé le"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__validation_date
-msgid "Date de validation"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_account_analytic_line__name
-msgid "Description"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code__display_name
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__display_name
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__display_name
-msgid "Display Name"
-msgstr "Nom affiché"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_account_analytic_line__ur_financial_system_id
-msgid "Dispositif Financier"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model,name:cgscop_timesheet.model_ur_financial_system
-msgid "Dispositif financier UR"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.actions.act_window,name:cgscop_timesheet.action_ur_financial_system
-#: model:ir.ui.menu,name:cgscop_timesheet.menu_ur_financial_system
-msgid "Dispositifs financiers"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__employee_id
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Employé"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Expenses of Your Team Member"
-msgstr "Dépense des membres de votre équipe"
-
-#. module: cgscop_timesheet
-#: model:ir.actions.report,name:cgscop_timesheet.cgscop_timesheet_sheet_report
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.report_timesheet_document
-msgid "Feuille de Temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_account_analytic_line__sheet_id
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Feuille de temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.ui.menu,name:cgscop_timesheet.timesheet_sheet_menu
-msgid "Feuilles de temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.actions.act_window,name:cgscop_timesheet.action_cgscop_timesheet_sheet_to_approve
-msgid "Feuilles de temps à valider"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Follow this project to automatically track the events associated to tasks and issues of this project."
-msgstr "Permet de suivre automatiquement les événements associés aux tâches et aux problèmes de ce projet."
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_follower_ids
-msgid "Followers"
-msgstr "Abonnés"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_channel_ids
-msgid "Followers (Channels)"
-msgstr "Abonnés (Canaux)"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_partner_ids
-msgid "Followers (Partners)"
-msgstr "Abonnés (Partenaires)"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_filter
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Group By"
-msgstr "Regrouper par"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_project_project__privacy_visibility
-msgid "Holds visibility of the tasks or issues that belong to the current project:\n"
-"- On invitation only: Employees may only see the followed project, tasks or issues\n"
-"- Visible by all employees: Employees may see all project, tasks or issues\n"
-"- Visible by following customers: employees see everything;\n"
-" if website is activated, portal users may see project, tasks or issues followed by\n"
-" them or by someone of their company\n"
-""
-msgstr "Détermine la visibilité des tâches ou anomalies qui dépendent du projet courant.\n"
-"- Sur invitation uniquement : les employés ne voient que les projets, tâches et anomalies qu'ils suivent ;\n"
-"- Visible par tous les salariés : les employés peuvent voir tous les projets, tâches et anomalies ;\n"
-"- Visible par les clients suivants : les employés voient tout ; si le site web est activé, les utilisateur du portail peuvent voir les projets, tâches et anomalies qu'eux ou un utilisateur appartenant à leur société, suivent.\n"
-""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code__id
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__id
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__id
-msgid "ID"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__message_unread
-msgid "If checked new messages require your attention."
-msgstr "Si coché, de nouveaux messages demandent votre attention."
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__message_needaction
-msgid "If checked, new messages require your attention."
-msgstr "Si coché, de nouveaux messages demandent votre attention."
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__message_has_error
-msgid "If checked, some messages have a delivery error."
-msgstr "Si actif, certains messages ont une erreur de livraison."
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_form
-msgid "Imprimer"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.actions.server,name:cgscop_timesheet.hr_timesheet_submit_action_server
-msgid "Insérer dans une feuille de temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_is_follower
-msgid "Is Follower"
-msgstr "Est un abonné"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code____last_update
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet____last_update
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system____last_update
-msgid "Last Modified on"
-msgstr "Dernière modification le"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code__write_uid
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__write_uid
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__write_uid
-msgid "Last Updated by"
-msgstr "Dernière mise à jour par"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code__write_date
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__write_date
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__write_date
-msgid "Last Updated on"
-msgstr "Dernière mise à jour le"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__timesheet_line_ids
-msgid "Lignes de temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Pièce jointe principale"
-
-#. module: cgscop_timesheet
-#: model:ir.actions.act_window,name:cgscop_timesheet.action_cgscop_timesheet_sheet_my_all
-#: model:ir.ui.menu,name:cgscop_timesheet.menu_hr_timesheet_my_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Mes feuilles de temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_has_error
-msgid "Message Delivery error"
-msgstr "Erreur d'envoi du message"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Mon équipe"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__activity_date_deadline
-msgid "Next Activity Deadline"
-msgstr "Date limite de l'Activité à Venir"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__activity_summary
-msgid "Next Activity Summary"
-msgstr "Résumé d'activité suivant"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__activity_type_id
-msgid "Next Activity Type"
-msgstr "Type d'Activités à Venir"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_code__name
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__name
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__name
-msgid "Nom"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_needaction_counter
-msgid "Number of Actions"
-msgstr "Nombre d'actions"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_has_error_counter
-msgid "Number of error"
-msgstr "Nombre d'erreurs"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr "Nombre de messages exigeant une action"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__message_has_error_counter
-msgid "Number of messages with delivery error"
-msgstr "Nombre de messages avec des erreurs d'envoi"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__message_unread_counter
-msgid "Number of unread messages"
-msgstr "Nombre de messages non lus"
-
-#. module: cgscop_timesheet
-#: selection:project.project,privacy_visibility:0
-msgid "On invitation only"
-msgstr "Sur invitation uniquement"
-
-#. module: cgscop_timesheet
-#: selection:cgscop.timesheet.sheet,activity_state:0
-msgid "Overdue"
-msgstr "Passé"
-
-#. module: cgscop_timesheet
-#: model:ir.actions.act_window,name:cgscop_timesheet.timesheet_action_report_by_contact
-#: model:ir.ui.menu,name:cgscop_timesheet.timesheet_menu_report_timesheet_by_contact
-msgid "Par Contact"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: selection:cgscop.timesheet.sheet,activity_state:0
-msgid "Planned"
-msgstr "Planifié"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_project_project__privacy_visibility
-msgid "Privacy"
-msgstr "Confidentialité"
-
-#. module: cgscop_timesheet
-#: model:ir.model,name:cgscop_timesheet.model_project_project
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Project"
-msgstr "Code activité UR"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_kanban
-msgid "Project Manager"
-msgstr "Responsable"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_tree
-msgid "Projects"
-msgstr "Projets"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_hr_timesheet_line_pivot
-msgid "Rapport"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_form
-msgid "Remettre en brouillon"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__activity_user_id
-msgid "Responsible User"
-msgstr "Responsable"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_filter
-msgid "Search Project"
-msgstr "Chercher un projet"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__company_id
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Société"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_form
-msgid "Soumettre"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: selection:account.analytic.line,state:0
-#: selection:cgscop.timesheet.sheet,state:0
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.cgscop_hr_timesheet_line_search
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Soumis"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__submit_date
-msgid "Soumis le"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__activity_state
-msgid "Status based on activities\n"
-"Overdue: Due date is already passed\n"
-"Today: Activity date is today\n"
-"Planned: Future activities."
-msgstr "Statut basé sur les activités\n"
-"En retard : la date d'échéance est déjà dépassée\n"
-"Aujourd'hui : la date d'activité est aujourd'hui\n"
-"Planifiée : activités futures"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_account_analytic_line__state
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__state
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Statut"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model,name:cgscop_timesheet.model_cgscop_timesheet_sheet
-#: model:ir.model,name:cgscop_timesheet.model_hr_timesheet_sheet
-msgid "Timesheet Report"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_tree
-msgid "Timesheet Reports"
-msgstr "Rapport de lignes de temps"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Timesheets"
-msgstr "Lignes de temps"
-
-#. module: cgscop_timesheet
-#: selection:cgscop.timesheet.sheet,activity_state:0
-msgid "Today"
-msgstr "Ajourd'hui"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__total_hour
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_tree
-msgid "Total"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.actions.act_window,name:cgscop_timesheet.action_cgscop_timesheet_sheet_all
-#: model:ir.ui.menu,name:cgscop_timesheet.menu_hr_timesheet_all
-msgid "Toutes les feuilles de temps"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_account_analytic_line__ur_id
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__ur_id
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_project_project__ur_id
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_ur_financial_system__ur_id
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_project_timesheet_form
-msgid "Union Régionale"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_unread
-msgid "Unread Messages"
-msgstr "Messages non lus"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr "Compteur de messages non lus"
-
-#. module: cgscop_timesheet
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_form
-msgid "Valider"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: selection:account.analytic.line,state:0
-#: selection:cgscop.timesheet.sheet,state:0
-#: model_terms:ir.ui.view,arch_db:cgscop_timesheet.view_cgscop_timesheet_sheet_filter
-msgid "Validé"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: selection:project.project,privacy_visibility:0
-msgid "Visible by all employees"
-msgstr "Visible par tous les employés"
-
-#. module: cgscop_timesheet
-#: selection:project.project,privacy_visibility:0
-msgid "Visible by following customers"
-msgstr "Visible par les clients suiveurs"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,field_description:cgscop_timesheet.field_cgscop_timesheet_sheet__website_message_ids
-msgid "Website Messages"
-msgstr "Messages du site web"
-
-#. module: cgscop_timesheet
-#: model:ir.model.fields,help:cgscop_timesheet.field_cgscop_timesheet_sheet__website_message_ids
-msgid "Website communication history"
-msgstr "Historique de communication du site web"
-
-#. module: cgscop_timesheet
-#: model:ir.model,name:cgscop_timesheet.model_cgscop_timesheet_print
-msgid "Wizard Timesheet Impression"
-msgstr ""
-
-#. module: cgscop_timesheet
-#: model:ir.ui.menu,name:cgscop_timesheet.menu_hr_timesheet_to_approve
-msgid "À valider"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_all
-#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_all
-msgid "All Timesheets"
-msgstr "Toutes les lignes de temps"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line
-#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_mine
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "My Timesheets"
-msgstr "Mes lignes de temps"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.project_task_action_view_timesheet
-#: model:ir.actions.report,name:hr_timesheet.timesheet_report
-msgid "Timesheet Entries"
-msgstr "Lignes de temps"
-
-#. module: hr_timesheet
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "Timesheet by Date"
-msgstr "Lignes de temps par date"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_from_employee
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__timesheet_ids
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_department_view_kanban
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.portal_my_task
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
-msgid "Timesheets"
-msgstr "Lignes de temps"
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_report_by_project
-#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_report_timesheet_by_project
-msgid "By Project"
-msgstr "Par Code activité UR"
-
-#. module: hr_timesheet
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
-#: model:ir.ui.menu,name:hr_timesheet.menu_timesheets_reports_timesheet
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-#: model_terms:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot
-msgid "Timesheet"
-msgstr "Lignes de Temps"
diff --git a/migration/14.0.1.0.0/post-migration.py b/migration/14.0.1.0.0/post-migration.py
new file mode 100644
index 0000000..0191717
--- /dev/null
+++ b/migration/14.0.1.0.0/post-migration.py
@@ -0,0 +1,46 @@
+# © 2022 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade # pylint: disable=W7936
+
+
+def get_years():
+ year_list = []
+ for i in range(2019, 2030):
+ year_list.append((str(i), str(i)))
+ return year_list
+
+
+def ur_month_timesheet_map_values(env):
+ openupgrade.map_values(
+ env.cr,
+ openupgrade.get_legacy_name("month"),
+ "month",
+ [
+ ("1", "Janv"),
+ ("2", "Fév"),
+ ("3", "Mars"),
+ ("4", "Avr"),
+ ("5", "Mai"),
+ ("6", "Juin"),
+ ("7", "Juil"),
+ ("8", "Août"),
+ ("9", "Sept"),
+ ("10", "Oct"),
+ ("11", "Nov"),
+ ("12", "Dec"),
+ ],
+ table="ur_month_timesheet",
+ )
+ openupgrade.map_values(
+ env.cr,
+ openupgrade.get_legacy_name("year"),
+ "year",
+ get_years(),
+ table="ur_month_timesheet",
+ )
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+ ur_month_timesheet_map_values(env)
diff --git a/migration/14.0.1.0.0/pre-migration.py b/migration/14.0.1.0.0/pre-migration.py
new file mode 100644
index 0000000..754ee3a
--- /dev/null
+++ b/migration/14.0.1.0.0/pre-migration.py
@@ -0,0 +1,13 @@
+# © 2022 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+column_renames = {
+ "ur_month_timesheet": [("month", None), ("year", None)],
+}
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+ openupgrade.rename_columns(env.cr, column_renames)
diff --git a/models/__init__.py b/models/__init__.py
index 92cffcb..bbbee8b 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -10,4 +10,3 @@ from . import res_partner
from . import ur_financial_system
from . import ur_month_timesheet
from . import ur_regional_convention
-
diff --git a/models/cgscop_timesheet_code.py b/models/cgscop_timesheet_code.py
index 5a8a518..3d0437c 100644
--- a/models/cgscop_timesheet_code.py
+++ b/models/cgscop_timesheet_code.py
@@ -7,13 +7,16 @@ from odoo import models, fields
class ScopTimesheetCode(models.Model):
_name = "cgscop.timesheet.code"
_description = "Code activité National"
- _order = 'name'
+ _order = "name"
- name = fields.Char('Nom')
+ name = fields.Char("Nom")
domain = fields.Selection(
- [('A', "Accompagnement"),
- ('D', "Développement"),
- ('F', "Formation"),
- ('R', "Révision"),
- ('Z', "Autre")],
- string='Domaine')
+ [
+ ("A", "Accompagnement"),
+ ("D", "Développement"),
+ ("F", "Formation"),
+ ("R", "Révision"),
+ ("Z", "Autre"),
+ ],
+ string="Domaine",
+ )
diff --git a/models/cgscop_timesheet_sheet.py b/models/cgscop_timesheet_sheet.py
index 6844736..1415e7b 100644
--- a/models/cgscop_timesheet_sheet.py
+++ b/models/cgscop_timesheet_sheet.py
@@ -7,75 +7,77 @@ from odoo.exceptions import UserError, ValidationError
class ScopHrTimesheetSheet(models.Model):
_name = "cgscop.timesheet.sheet"
- _inherit = ['mail.thread', 'mail.activity.mixin']
+ _inherit = ["mail.thread", "mail.activity.mixin"]
_description = "Timesheet Report"
_order = "create_date desc, validation_date desc, id desc"
def _default_ur(self):
- return self.env['res.company']._ur_default_get()
+ return self.env["res.company"]._ur_default_get()
- name = fields.Char('Nom', required=True)
+ name = fields.Char("Nom", required=True)
timesheet_line_ids = fields.One2many(
- comodel_name='account.analytic.line',
- inverse_name='sheet_id',
- string='Lignes de temps',
- states={'valid': [('readonly', True)]},
- copy=False)
- state = fields.Selection([
- ('draft', 'Brouillon'),
- ('submit', 'Soumis'),
- ('valid', 'Validé')],
- string='Statut',
+ comodel_name="account.analytic.line",
+ inverse_name="sheet_id",
+ string="Lignes de temps",
+ states={"valid": [("readonly", True)]},
+ copy=False,
+ )
+ state = fields.Selection(
+ [("draft", "Brouillon"), ("submit", "Soumis"), ("valid", "Validé")],
+ string="Statut",
index=True,
- track_visibility='onchange',
+ tracking=True,
copy=False,
- default='draft',
- required=True)
+ default="draft",
+ required=True,
+ )
employee_id = fields.Many2one(
- comodel_name='hr.employee',
+ comodel_name="hr.employee",
string="Employé",
required=True,
readonly=True,
- states={'draft': [('readonly', False)]},
- default=lambda self: self.env['hr.employee'].search(
- [('user_id', '=', self.env.uid)], limit=1))
+ states={"draft": [("readonly", False)]},
+ default=lambda self: self.env["hr.employee"].search(
+ [("user_id", "=", self.env.uid)], limit=1
+ ),
+ )
total_hour = fields.Float(
- string='Total',
- compute='_compute_hour',
- store=True)
+ string="Total", compute="_compute_hour", store=True
+ )
company_id = fields.Many2one(
- comodel_name='res.company',
- string='Company',
+ comodel_name="res.company",
+ string="Company",
readonly=True,
- states={'draft': [('readonly', False)]},
- default=lambda self: self.env.user.company_id)
+ states={"draft": [("readonly", False)]},
+ default=lambda self: self.env.user.company_id,
+ )
validation_date = fields.Date("Date de validation")
submit_date = fields.Date("Soumis le")
ur_id = fields.Many2one(
- 'union.regionale',
- string='Union Régionale',
+ "union.regionale",
+ string="Union Régionale",
index=True,
- on_delete='restrict',
- default=_default_ur)
- can_edit = fields.Boolean('Can Reset', compute='_compute_can_reset')
+ ondelete="restrict",
+ default=_default_ur,
+ )
+ can_edit = fields.Boolean("Can Reset", compute="_compute_can_reset")
# ------------------------------------------------------
# Compute Functions
# ------------------------------------------------------
- @api.depends(
- 'timesheet_line_ids',
- 'timesheet_line_ids.unit_amount')
+ @api.depends("timesheet_line_ids", "timesheet_line_ids.unit_amount")
def _compute_hour(self):
for sheet in self:
sheet.total_hour = sum(
- sheet.timesheet_line_ids.mapped('unit_amount'))
+ sheet.timesheet_line_ids.mapped("unit_amount")
+ )
- @api.multi
def _compute_can_reset(self):
is_timesheet_user = self.user_has_groups(
- 'hr_timesheet.group_timesheet_manager')
+ "hr_timesheet.group_timesheet_manager"
+ )
for sheet in self:
- if sheet.state == 'draft' or is_timesheet_user:
+ if sheet.state == "draft" or is_timesheet_user:
sheet.can_edit = True
else:
sheet.can_edit = False
@@ -83,48 +85,45 @@ class ScopHrTimesheetSheet(models.Model):
# ------------------------------------------------------
# Constain Functions
# ------------------------------------------------------
- @api.constrains('timesheet_line_ids', 'employee_id')
+ @api.constrains("timesheet_line_ids", "employee_id")
def _check_employee(self):
for sheet in self:
- employee_ids = sheet.timesheet_line_ids.mapped('employee_id')
- if len(employee_ids) > 1 or (len(employee_ids) == 1 and employee_ids != sheet.employee_id):
+ employee_ids = sheet.timesheet_line_ids.mapped("employee_id")
+ if len(employee_ids) > 1 or (
+ len(employee_ids) == 1 and employee_ids != sheet.employee_id
+ ):
raise ValidationError(
- 'Vous ne pouvez pas ajouter les lignes'
- ' de temps de plusieurs employés.')
+ "Vous ne pouvez pas ajouter les lignes"
+ " de temps de plusieurs employés."
+ )
# ------------------------------------------------------
# Override ORM
# ------------------------------------------------------
- @api.multi
def unlink(self):
for timesheet in self:
- if timesheet.state in ['submit', 'valid']:
- raise UserError('Vous ne pouvez pas supprimer une '
- 'feuille de temps soumise ou validée')
+ if timesheet.state in ["submit", "valid"]:
+ raise UserError(
+ "Vous ne pouvez pas supprimer une "
+ "feuille de temps soumise ou validée"
+ )
super(ScopHrTimesheetSheet, self).unlink()
# ------------------------------------------------------
# Action button
# ------------------------------------------------------
- @api.multi
def action_submit_timesheet(self):
- self.write({
- 'state': 'submit',
- 'submit_date': fields.Date.today()})
+ self.write({"state": "submit", "submit_date": fields.Date.today()})
- @api.multi
def approve_timesheet_sheets(self):
- self.write({
- 'state': 'valid',
- 'validation_date': fields.Date.today()})
+ self.write({"state": "valid", "validation_date": fields.Date.today()})
- @api.multi
def reset_timesheet_sheets(self):
- self.write({
- 'state': 'draft',
- 'submit_date': False,
- 'validation_date': False})
+ self.write(
+ {"state": "draft", "submit_date": False, "validation_date": False}
+ )
def print_timesheet(self):
return self.env.ref(
- 'cgscop_timesheet.cgscop_timesheet_sheet_report').report_action(self)
+ "cgscop_timesheet.cgscop_timesheet_sheet_report"
+ ).report_action(self)
diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py
index c41b247..88aa83f 100644
--- a/models/hr_timesheet.py
+++ b/models/hr_timesheet.py
@@ -11,83 +11,87 @@ class ScopHrTimesheet(models.Model):
_inherit = "account.analytic.line"
def _default_ur(self):
- return self.env['res.company']._ur_default_get()
+ return self.env["res.company"]._ur_default_get()
# Inherited fields
name = fields.Char(required=False)
partner_id = fields.Many2one(required=True)
-
+
# New fields
cgscop_timesheet_code_id = fields.Many2one(
- related='project_id.cgscop_timesheet_code_id',
- string='Code Activité National',
- store=True)
+ related="project_id.cgscop_timesheet_code_id",
+ string="Code Activité National",
+ store=True,
+ )
ur_financial_system_id = fields.Many2one(
- comodel_name='ur.financial.system',
- string='Dispositif Financier')
+ comodel_name="ur.financial.system", string="Dispositif Financier"
+ )
ur_regional_convention_id = fields.Many2one(
- comodel_name='ur.regional.convention',
- string='Convention Régionale')
+ comodel_name="ur.regional.convention", string="Convention Régionale"
+ )
ur_id = fields.Many2one(
- 'union.regionale',
- string='Union Régionale',
+ "union.regionale",
+ string="Union Régionale",
index=True,
- ondelete='restrict',
- default=_default_ur)
+ ondelete="restrict",
+ default=_default_ur,
+ )
sheet_id = fields.Many2one(
- comodel_name='cgscop.timesheet.sheet',
+ comodel_name="cgscop.timesheet.sheet",
string="Feuille de temps",
readonly=True,
- copy=False)
- state = fields.Selection([
- ('to_report', 'A rapporter'),
- ('draft', 'Brouillon'),
- ('submit', 'Soumis'),
- ('valid', 'Validé')],
- compute='_compute_state',
- string='Statut',
+ copy=False,
+ )
+ state = fields.Selection(
+ [
+ ("to_report", "A rapporter"),
+ ("draft", "Brouillon"),
+ ("submit", "Soumis"),
+ ("valid", "Validé"),
+ ],
+ compute="_compute_state",
+ string="Statut",
copy=False,
index=True,
readonly=True,
- store=True,)
+ store=True,
+ )
ur_financial_system_nb = fields.Integer(
- string="Nb Dispositifs Financiers",
- compute="_compute_ur_system_nb")
+ string="Nb Dispositifs Financiers", compute="_compute_ur_system_nb"
+ )
ur_regional_convention_nb = fields.Integer(
- string="Nb conventions régionales",
- compute="_compute_ur_system_nb")
+ string="Nb conventions régionales", compute="_compute_ur_system_nb"
+ )
is_present = fields.Boolean("Présentiel")
- justificatifs = fields.Char(
- string="Justificatifs",
- required=False)
+ justificatifs = fields.Char(string="Justificatifs", required=False)
calendar_l1 = fields.Char(
- string='Ligne 1 calendrier',
- compute='_compute_calendar_l1',
- store=False)
+ string="Ligne 1 calendrier",
+ compute="_compute_calendar_l1",
+ )
calendar_l2 = fields.Char(
- string='Ligne 2 calendrier',
- compute='_compute_calendar_l2',
- store=False)
+ string="Ligne 2 calendrier",
+ compute="_compute_calendar_l2",
+ )
# ------------------------------------------------------
# Compute Functions
# ------------------------------------------------------
- @api.depends('ur_id')
+ @api.depends("ur_id")
def _compute_ur_system_nb(self):
for timesheet in self:
# Calcul nombre de dispositifs financiers
- financial_system = timesheet.env['ur.financial.system'].search([
- ('ur_id', '=', timesheet.ur_id.id)])
- timesheet.ur_financial_system_nb = len(
- financial_system)
+ financial_system = timesheet.env["ur.financial.system"].search(
+ [("ur_id", "=", timesheet.ur_id.id)]
+ )
+ timesheet.ur_financial_system_nb = len(financial_system)
# Calcul nombre de conventions
- regional_convention = timesheet.env['ur.regional.convention'].search([
- ('ur_id', '=', timesheet.ur_id.id)])
- timesheet.ur_regional_convention_nb = len(
- regional_convention)
+ regional_convention = timesheet.env[
+ "ur.regional.convention"
+ ].search([("ur_id", "=", timesheet.ur_id.id)])
+ timesheet.ur_regional_convention_nb = len(regional_convention)
- @api.depends('sheet_id', 'sheet_id.state')
+ @api.depends("sheet_id", "sheet_id.state")
def _compute_state(self):
for timesheet in self:
if not timesheet.sheet_id:
@@ -95,16 +99,16 @@ class ScopHrTimesheet(models.Model):
else:
timesheet.state = timesheet.sheet_id.state
- @api.depends('project_id', 'partner_id')
+ @api.depends("project_id", "partner_id")
def _compute_calendar_l1(self):
for ts in self:
ts.calendar_l1 = ""
if ts.project_id:
- ts.calendar_l1 += ts.project_id.name + ', '
+ ts.calendar_l1 += ts.project_id.name + ", "
if ts.partner_id:
ts.calendar_l1 += ts.partner_id.name
- @api.depends('unit_amount')
+ @api.depends("unit_amount")
def _compute_calendar_l2(self):
for ts in self:
ts.calendar_l2 = "Durée : " + str(ts.unit_amount) + " heure(s)"
@@ -112,8 +116,7 @@ class ScopHrTimesheet(models.Model):
# ------------------------------------------------------
# Override le _rec_name
# ------------------------------------------------------
- @api.multi
- @api.depends('project_id', 'partner_id')
+ @api.depends("project_id", "partner_id")
def name_get(self):
result = []
for ts in self:
@@ -124,96 +127,113 @@ class ScopHrTimesheet(models.Model):
# ------------------------------------------------------
# OnChange Functions
# ------------------------------------------------------
- @api.onchange('project_id')
+ @api.onchange("project_id")
def onchange_project_id(self):
self.partner_id = self.project_id.partner_id
- @api.onchange('partner_id')
+ @api.onchange("partner_id")
def onchange_partner_id(self):
# affiche le Dispositif Financier par défaut sur la LdT
# si il n'y a pas de date limite du dispositif
# ou si la date de la Ldt est inférieure à la date limite du dispositif
- if not self.partner_id.ur_financial_system_date or \
- self.date <= self.partner_id.ur_financial_system_date:
+ if (
+ not self.partner_id.ur_financial_system_date
+ or self.date <= self.partner_id.ur_financial_system_date
+ ):
self.ur_financial_system_id = self.partner_id.ur_financial_system_id
+
# affiche la Convention par défaut sur la LdT
# si il n'y a pas de date limite de la convention
# ou si la date de la LdT est inférieure à la date limite de la convention
- if not self.partner_id.ur_regional_convention_date or \
- self.date <= self.partner_id.ur_regional_convention_date:
- self.ur_regional_convention_id = self.partner_id.\
- ur_regional_convention_id
+ if (
+ not self.partner_id.ur_regional_convention_date
+ or self.date <= self.partner_id.ur_regional_convention_date
+ ):
+ self.ur_regional_convention_id = self.partner_id.ur_regional_convention_id
# ------------------------------------------------------
# Contrains
# ------------------------------------------------------
- @api.constrains('unit_amount', 'date')
+ @api.constrains("unit_amount", "date")
def _check_hours(self):
for record in self:
- lines = self.search([
- ('date', '=', record.date),
- ('employee_id', '=', record.employee_id.id)])
- total = sum(lines.mapped('unit_amount'))
- if (not self.env.user.company_id.day_working
- and total > self.env.user.company_id.day_duration):
+ lines = self.search(
+ [
+ ("date", "=", record.date),
+ ("employee_id", "=", record.employee_id.id),
+ ]
+ )
+ total = sum(lines.mapped("unit_amount"))
+ if (
+ not self.env.user.company_id.day_working
+ and total > self.env.user.company_id.day_duration
+ ):
raise ValidationError(
"Vous ne pouvez imputer plus de %sh sur la même journée.\n"
- "Journée du %s" % (
+ "Journée du %s"
+ % (
self.env.user.company_id.day_duration,
- record.date.strftime("%d/%m/%Y")))
+ record.date.strftime("%d/%m/%Y"),
+ )
+ )
- @api.constrains('date')
+ @api.constrains("date")
def _check_weekday(self):
for line in self:
dt = datetime.combine(line.date, time(12, 00))
- holiday = self.env['resource.calendar.leaves'].search([
- '|',
- ('company_id', '=', False),
- ('company_id', '=', self.env.user.company_id.id),
- ('date_from', '<=', dt),
- ('date_to', '>=', dt),
- ])
+ holiday = self.env["resource.calendar.leaves"].search(
+ [
+ "|",
+ ("company_id", "=", False),
+ ("company_id", "=", self.env.user.company_id.id),
+ ("date_from", "<=", dt),
+ ("date_to", ">=", dt),
+ ]
+ )
if line.date.weekday() in (5, 6) or holiday:
raise ValidationError(
"Vous ne pouvez imputer du temps sur un weekend "
- "ou un jour férié.")
+ "ou un jour férié."
+ )
# ------------------------------------------------------
# Override ORM
# ------------------------------------------------------
- @api.multi
def unlink(self):
for timesheet in self:
- if timesheet.state in ['submit', 'valid']:
- raise UserError('Vous ne pouvez pas supprimer une '
- 'ligne de temps soumise ou validée')
+ if timesheet.state in ["submit", "valid"]:
+ raise UserError(
+ "Vous ne pouvez pas supprimer une "
+ "ligne de temps soumise ou validée"
+ )
super(ScopHrTimesheet, self).unlink()
# ------------------------------------------------------
# Actions
# ------------------------------------------------------
- @api.multi
def action_submit_timesheet_lines(self):
"""
- Crée une feuille de temps avec les lignes sélectionnées
+ Crée une feuille de temps avec les lignes sélectionnées
"""
- if any(time.state != 'to_report' or time.sheet_id for time in self):
+ if any(time.state != "to_report" or time.sheet_id for time in self):
raise UserError(
- "Vous ne pouvez pas insérer 2 fois la même ligne !")
- if len(self.mapped('employee_id')) != 1:
+ "Vous ne pouvez pas insérer 2 fois la même ligne !"
+ )
+ if len(self.mapped("employee_id")) != 1:
raise UserError(
"Il ne peut y avoir plusieurs employés dans une "
- "même feuille de temps.")
+ "même feuille de temps."
+ )
return {
- 'name': 'New Expense Report',
- 'type': 'ir.actions.act_window',
- 'view_mode': 'form',
- 'res_model': 'cgscop.timesheet.sheet',
- 'target': 'current',
- 'context': {
- 'default_timesheet_line_ids': self.ids,
- 'default_employee_id': self[0].employee_id.id,
- 'default_name': self[0].name if len(self) == 1 else ''
- }
+ "name": "New Expense Report",
+ "type": "ir.actions.act_window",
+ "view_mode": "form",
+ "res_model": "cgscop.timesheet.sheet",
+ "target": "current",
+ "context": {
+ "default_timesheet_line_ids": self.ids,
+ "default_employee_id": self[0].employee_id.id,
+ "default_name": self[0].name if len(self) == 1 else "",
+ },
}
diff --git a/models/project.py b/models/project.py
index d3850c7..e42a076 100644
--- a/models/project.py
+++ b/models/project.py
@@ -8,23 +8,26 @@ class ScopProjectTimesheet(models.Model):
_inherit = "project.project"
def _default_ur(self):
- return self.env['res.company']._ur_default_get()
+ return self.env["res.company"]._ur_default_get()
cgscop_timesheet_code_id = fields.Many2one(
- comodel_name='cgscop.timesheet.code',
- string='Code Activité National')
+ comodel_name="cgscop.timesheet.code", string="Code Activité National"
+ )
privacy_visibility = fields.Selection(default="employees")
ur_id = fields.Many2one(
- 'union.regionale',
- string='Union Régionale',
+ "union.regionale",
+ string="Union Régionale",
index=True,
- on_delete='restrict',
- default=_default_ur)
+ ondelete="restrict",
+ default=_default_ur,
+ )
- @api.onchange('name')
+ @api.onchange("name")
def onchange_name(self):
analytic = self.analytic_account_id
if analytic and analytic.ensure_one():
- self.analytic_account_id.sudo().write({
- 'name': self.name,
- })
+ self.analytic_account_id.sudo().write(
+ {
+ "name": self.name,
+ }
+ )
diff --git a/models/res_company.py b/models/res_company.py
index 7151932..5bcb365 100644
--- a/models/res_company.py
+++ b/models/res_company.py
@@ -8,11 +8,13 @@ class ResCompanyTmesheet(models.Model):
_inherit = "res.company"
day_duration = fields.Float(
- string='Nb Heures/Jour',
+ string="Nb Heures/Jour",
default=8,
- help="Nombre d'heures max pour imputation")
+ help="Nombre d'heures max pour imputation",
+ )
day_working = fields.Boolean(
- string='Forfait Jour',
+ string="Forfait Jour",
default=False,
- help='Si cette option est cochée, un employé peut imputer sans limite'
- ' de temps sur une journée')
+ help="Si cette option est cochée, un employé peut imputer sans limite"
+ " de temps sur une journée",
+ )
diff --git a/models/res_partner.py b/models/res_partner.py
index 848ce99..1322cb9 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -8,23 +8,23 @@ class ScopPartnerTimesheet(models.Model):
_inherit = "res.partner"
ur_financial_system_id = fields.Many2one(
- comodel_name='ur.financial.system',
- string='Dispositif Financier',
- ondelete='set null')
- ur_financial_system_date = fields.Date(
- "Date de fin de dispositif")
+ comodel_name="ur.financial.system",
+ string="Dispositif Financier",
+ ondelete="set null",
+ )
+ ur_financial_system_date = fields.Date("Date de fin de dispositif")
ur_regional_convention_id = fields.Many2one(
- comodel_name='ur.regional.convention',
- string='Convention Régionale',
- ondelete='set null')
- ur_regional_convention_date = fields.Date(
- "Date de fin de convention")
+ comodel_name="ur.regional.convention",
+ string="Convention Régionale",
+ ondelete="set null",
+ )
+ ur_regional_convention_date = fields.Date("Date de fin de convention")
ur_financial_system_nb = fields.Integer(
- string="Nb Dispositifs Financiers",
- compute="_compute_ur_system_nb")
+ string="Nb Dispositifs Financiers", compute="_compute_ur_system_nb"
+ )
ur_regional_convention_nb = fields.Integer(
- string="Nb conventions régionales",
- compute="_compute_ur_system_nb")
+ string="Nb conventions régionales", compute="_compute_ur_system_nb"
+ )
# ------------------------------------------------------
# Compute Functions
@@ -32,12 +32,12 @@ class ScopPartnerTimesheet(models.Model):
def _compute_ur_system_nb(self):
for partner in self:
# Calcul nombre de dispositifs financiers
- financial_system = partner.env['ur.financial.system'].search([
- ('ur_id', '=', self.env.user.ur_id.id)])
- partner.ur_financial_system_nb = len(
- financial_system)
+ financial_system = partner.env["ur.financial.system"].search(
+ [("ur_id", "=", self.env.user.ur_id.id)]
+ )
+ partner.ur_financial_system_nb = len(financial_system)
# Calcul nombre de conventions
- regional_convention = partner.env['ur.regional.convention'].search([
- ('ur_id', '=', self.env.user.ur_id.id)])
- partner.ur_regional_convention_nb = len(
- regional_convention)
+ regional_convention = partner.env["ur.regional.convention"].search(
+ [("ur_id", "=", self.env.user.ur_id.id)]
+ )
+ partner.ur_regional_convention_nb = len(regional_convention)
diff --git a/models/ur_financial_system.py b/models/ur_financial_system.py
index a608e52..f1aa473 100644
--- a/models/ur_financial_system.py
+++ b/models/ur_financial_system.py
@@ -9,16 +9,18 @@ class ScopTimesheetCode(models.Model):
_description = "Dispositif financier UR"
def _default_ur(self):
- return self.env['res.company']._ur_default_get()
+ return self.env["res.company"]._ur_default_get()
- name = fields.Char('Nom')
+ name = fields.Char("Nom")
company_id = fields.Many2one(
- comodel_name='res.company',
- string='Société',
- default=lambda self: self.env.user.company_id)
+ comodel_name="res.company",
+ string="Société",
+ default=lambda self: self.env.user.company_id,
+ )
ur_id = fields.Many2one(
- 'union.regionale',
- string='Union Régionale',
+ "union.regionale",
+ string="Union Régionale",
index=True,
- on_delete='restrict',
- default=_default_ur)
+ ondelete="restrict",
+ default=_default_ur,
+ )
diff --git a/models/ur_month_timesheet.py b/models/ur_month_timesheet.py
index 11f9c4d..76753cc 100644
--- a/models/ur_month_timesheet.py
+++ b/models/ur_month_timesheet.py
@@ -7,67 +7,88 @@ from odoo import models, fields, api
def get_years():
year_list = []
for i in range(2019, 2030):
- year_list.append((i, str(i)))
+ year_list.append((str(i), str(i)))
return year_list
-MONTHS = [(1, 'Janv'), (2, 'Fév'), (3, 'Mars'), (4, 'Avr'),
- (5, 'Mai'), (6, 'Juin'), (7, 'Juil'), (8, 'Août'),
- (9, 'Sept'), (10, 'Oct'), (11, 'Nov'), (12, 'Dec')]
+
+MONTHS = [
+ ("1", "Janv"),
+ ("2", "Fév"),
+ ("3", "Mars"),
+ ("4", "Avr"),
+ ("5", "Mai"),
+ ("6", "Juin"),
+ ("7", "Juil"),
+ ("8", "Août"),
+ ("9", "Sept"),
+ ("10", "Oct"),
+ ("11", "Nov"),
+ ("12", "Dec"),
+]
class ScopMonthTimesheet(models.Model):
_name = "ur.month.timesheet"
_description = "Heures theoriques mensuelles"
- _order = 'year, month'
+ _order = "year, month"
def _default_ur(self):
- return self.env['res.company']._ur_default_get()
+ return self.env["res.company"]._ur_default_get()
year = fields.Selection(
- selection=get_years(),
- string='Année',
- default=fields.Date.today().year)
- month = fields.Selection(
- selection=MONTHS,
- string='Année')
+ selection=get_years(), string="Année", default=fields.Date.today().year
+ )
+ month = fields.Selection(selection=MONTHS, string="Mois")
company_id = fields.Many2one(
- comodel_name='res.company',
- string='Société',
- default=lambda self: self.env.user.company_id)
+ comodel_name="res.company",
+ string="Société",
+ default=lambda self: self.env.user.company_id,
+ )
ur_id = fields.Many2one(
- 'union.regionale',
- string='Union Régionale',
+ "union.regionale",
+ string="Union Régionale",
index=True,
- on_delete='restrict',
- default=_default_ur)
- working_time = fields.Integer('Heures théoriques')
+ ondelete="restrict",
+ default=_default_ur,
+ )
+ working_time = fields.Integer("Heures théoriques")
- _sql_constraints = [(
- 'month_year_uniq',
- 'UNIQUE (year, month, ur_id)',
- 'Cette date a déjà été renseignée.'
- )]
+ _sql_constraints = [
+ (
+ "month_year_uniq",
+ "UNIQUE (year, month, ur_id)",
+ "Cette date a déjà été renseignée.",
+ )
+ ]
@api.model
def get_month_values(self):
- month_values = self.search([
- '&', '|', '&',
- ('year', '<', fields.Date.today().year),
- ('month', '>', fields.Date.today().month),
- '&',
- ('year', '<', fields.Date.today().year + 1),
- ('month', '<=', fields.Date.today().month + 1),
- ('ur_id', '=', self.env.user.ur_id.id)],
+ month_values = self.search(
+ [
+ "&",
+ "|",
+ "&",
+ ("year", "<", fields.Date.today().year),
+ ("month", ">", fields.Date.today().month),
+ "&",
+ ("year", "<", fields.Date.today().year + 1),
+ ("month", "<=", fields.Date.today().month + 1),
+ ("ur_id", "=", self.env.user.ur_id.id),
+ ],
limit=12,
- order='year desc, month desc').sorted(reverse=False)
+ order="year desc, month desc",
+ ).sorted(reverse=False)
return {
- 'month': month_values.mapped(lambda x: {
- 'year': x.year,
- 'num_month': x.month,
- 'month': self._fields['month'].selection[x.month-1][1]}),
- 'values': month_values.mapped('working_time'),
- 'today': {
- 'year': fields.Date.today().year,
- 'month': fields.Date.today().month
- }
+ "month": month_values.mapped(
+ lambda x: {
+ "year": x.year,
+ "num_month": x.month,
+ "month": self._fields["month"].selection[x.month - 1][1],
+ }
+ ),
+ "values": month_values.mapped("working_time"),
+ "today": {
+ "year": fields.Date.today().year,
+ "month": fields.Date.today().month,
+ },
}
diff --git a/models/ur_regional_convention.py b/models/ur_regional_convention.py
index 04a986c..6129a14 100644
--- a/models/ur_regional_convention.py
+++ b/models/ur_regional_convention.py
@@ -9,16 +9,18 @@ class ScopRegionalConvention(models.Model):
_description = "Convention Régionale UR"
def _default_ur(self):
- return self.env['res.company']._ur_default_get()
+ return self.env["res.company"]._ur_default_get()
- name = fields.Char('Nom')
+ name = fields.Char("Nom")
company_id = fields.Many2one(
- comodel_name='res.company',
- string='Société',
- default=lambda self: self.env.user.company_id)
+ comodel_name="res.company",
+ string="Société",
+ default=lambda self: self.env.user.company_id,
+ )
ur_id = fields.Many2one(
- 'union.regionale',
- string='Union Régionale',
+ "union.regionale",
+ string="Union Régionale",
index=True,
- on_delete='restrict',
- default=_default_ur)
+ ondelete="restrict",
+ default=_default_ur,
+ )
diff --git a/report/report_hr_timesheet.xml b/report/report_hr_timesheet.xml
index c144230..f6f1b49 100644
--- a/report/report_hr_timesheet.xml
+++ b/report/report_hr_timesheet.xml
@@ -107,17 +107,14 @@
</record>
<!-- QWeb Reports -->
- <report
- id="cgscop_timesheet_sheet_report"
- model="cgscop.timesheet.sheet"
- string="CG Scop - Feuille de Temps"
- report_type="qweb-pdf"
- name="cgscop_timesheet.report_timesheet_sheet"
- file="cgscop_timesheet.report_timesheet_sheet"
- paperformat="cgscop_paperformat_a4_landscape"
- menu="False"
- />
-
+ <record id="cgscop_timesheet_sheet_report" model="ir.actions.report">
+ <field name="name">CG Scop - Feuille de Temps</field>
+ <field name="model">cgscop.timesheet.sheet</field>
+ <field name="report_type">qweb-pdf</field>
+ <field name="report_name">cgscop_timesheet.report_timesheet_sheet</field>
+ <field name="report_file">cgscop_timesheet.report_timesheet_sheet</field>
+ <field name="paperformat_id" ref="cgscop_paperformat_a4_landscape"/>
+ </record>
</data>
</odoo>
diff --git a/security/security_rules.xml b/security/security_rules.xml
index 7a6b638..c60f601 100644
--- a/security/security_rules.xml
+++ b/security/security_rules.xml
@@ -3,7 +3,7 @@
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo>
- <data noupdate="0">
+ <data>
<record id="ur_financial_system_rule_ur" model="ir.rule">
<field name="name">ur financial system rule per ur</field>
diff --git a/static/description/icon.png b/static/description/icon.png
index 82ef47760a441cf229b5009f0a18ccf3842fbfa5..499652a2c9c0307f875bafc145b6fbafa133da72 100644
GIT binary patch
literal 15890
zcmeAS@N?(olHy`uVBq!ia0y~yVCVs14mJh`hII!V?HCwD&Q*m(lmsP~D-;yvr)B1(
zDwI?fq$;FVWTr7NRNUG-D}7S*PSMu?$)a&gpIE0gM?96S`1$Xg@@`u%(@Abmm(5xt
zA&_Umxc=_X^ZVET7PnWO{-$VSSoPX@^Y0Y*H>;oBUw5onzNYTo{Q2ANy>HczFQ1?9
z66a;J?7R4@-=F2zx1VQ><8MxXYR%mG^QpA${^R-aydv@Zp4yi_|CL*@pWW-@SGNj&
zgSgwDwwnKbE%vO^cHjR0T+I9Z%6Hc8e3Sn#-z8uCnWy1Akx9?(mi>uxxRhU#Y2$zF
zvl+MFH=FZ!o?p4&EI8r)(UbpEL*Kn#Q)9<%U-5VKk|n>Y?tVNp{otDU{r78ar>u{w
z=YKIz;D73~Eq3Yu9+mF5yYwM-!q@8edGGFhzIFG+)Ct$VFSFbB$>wqM<O$24XHT8|
zF}fn}{MzE|zE@XcZtL6cTzkP;<(>JH4Tm|*=R7ZLJt|aebFreQ@aUI4*Crj63;*=)
zq`>xq#Y^XvWj!gFc<;#SkHxwVXKuH@y!OJ33U)h5=H}M$UytYS{9CY~I`os`k8hIN
z*F>+1=s3^3Y&&0x^<mwWz)Ge+g};BfSNf)Guu06zDfsbIDrwq>b-GsrtAytMNO<^h
z>XU@uwhW3%?+zt7DKYPB3vuGTm$XHoBU#zLxlzhjSY4B2>5;Qq$$l#*%@H#-zrXQA
zjoGvxRg!0v1XV+Ct(>^PaUDy}mHwx0yuFhS><Y@-c*#qD@v>RjE4N08{^0eVwl>0a
zbJ|@uZ{6*evNm6fd7b;^hVX-ks<+po-`Db}$@bX%`1XJ~`HaQoGn>y?<!-zAJYvfE
zQ>)kP$}!#kOUnA)mV=$K+uv^cEvGKy_3}xupKaN#m+3KHZ<o!^-}&`c?)Lj1XKsBE
zm-+YEx6hH>@{!&C%f2}NJ|h)x`ddPY!>_Bz?N}0D%AF~UTvl4?`&#EL4t_Po_`Y&%
zpwem`uXB8-BqYzMA1OMV{_fxOo%)}i75#Is?3SNd>~(kki8;Zq>L%>W|NL$4n%s?N
zKb^Fd43gGbVRx}^>3tis7njQ3DZe-PoSA(6jk>_0r10-z)0Xa8)4ta)bGcd5-e*aZ
z_ssnyH(mCNkhjt5*XOLA`V{%?ucYt%(BH83y79yZ&lmsx)q217kHm>j9ldWi%?kG3
z-Tp&mDpPk?>9y)r;VlcTq!R_U*ZqC-c8b!Cv;|&szui#N7qfeGyk)8T3;Ej?_B*w{
zt8e?t&n7kR@9*d%|8?%Ul}xSJFyG`lpY1idw62*MTesvj{C<Dq+4mQ_m)~0dHsaZq
z*VckP$?^|do(i`s?`S^vY4tk`y`!>+mn<`_*3f<P=dWn*#&26EX?nffWiv-$YMtYp
zkksBQNAFja+}~3;ujOZfo8`U>#uv+GrRSFQ7zt=zP+z#lb$ZIF$Javri<dr^Jmfm}
zMJiXz+OKur=AC?f`f3?xufw!G)w(Sgzx953uIO-j#YV}sy^lG5yx81R$8l-a?j@l@
z8?uyTEq+F7{Mox${(SwP=gL35)=XSj=6CvNUDH+xvniW;U(K1>7R~;aA!%--6bHkB
zH4Znu!VYDf*k}0S`k~z)w{a?%6o0Y!d-vO1HN{!)I8*P7-QfIi{du1Fi#1{2RxL>F
zH_P*VBg!Sa>#C&q1o!nvA6xfc=}S+#bo2aDl}|B~?-^$PDAjR1EXHl<G;N)npSyhO
zDeY~cpDl0i{cd;gb^f9c+WqeybH?NemHTi_yL6*iGOFY2J--7Q_d4HvIv%B@>$7X!
z#ap_KoZlO67PoKK)z4Bj?~*slynUQ|s)0q}mcnx!zR^q~>F3-wUAwh4Kfgg${=w3>
z2joiSy&ZhhzuZ-oGiHtM(h%LDwv9#NyUE>iZrZ)OF1D8}EfuPK?yxRqJ0C+xeztYn
zEI-HFrn5MDcO8>qExqyitl2N6=k0IqURp4jyZg!6u*drt#b)~PIC@Si4OilnRGc+^
zzW^6YMbe$sOS?ZvvU$1e-rl=$Vb-#Faw4_{ndxym=F5Fk&^)~_;N6+V2XC3C&*ffz
zKzu=~X~jehJ%b&-4vxn6de^OTwQlK)YHv0!-LW`p>a9(}FQ@%fU~_q5ZOV1iS(k??
zmdUztB7>Z=;npb&l-zps_9w}j%kQvOWjb*0;^m9cuM;j^)5~G3V2_YDd#w~MdTDu<
z=ycAug_{LG7SC0@cfPv+j@}H0vM9?075&`*OgryAe?7D7?QQq(i_Q1_?`W_%7{5PV
zcFUP9Qx=q+64RDC$D+b|_T?tNTOvj0)q<1R6fPfcv@^ZJ96DFj?#jOi(Vt9*0@raL
zcj?)+)O7W$t;{wO{HqSyM4mgiEbzdIn_>P>Pv3CoWW9A$WBP>eD=)C^x)oHQ9k}I^
zM7Z0uQ!Wk%C0dI*5^O&-r8fOr$+lu~mtFs+I-|QSi|2i05Z1J2m}DR>){?F<@oCxJ
zg}d~2Eo9wxz2ijc)?9@H61jcL&nmv1+Hllk`gey^Z||jP(udgizKcYbJ`h~Dv7<|B
za|H8t-oGhF8qOVM4qk2?@cVFni{tHg3|G>d_snRyQqAfWzB)xtN#UJ>o>2FH_ZbJS
zdk5YTb-a?h#@)~Aob$b9(Fy8pk2?i5U$o7?;c$TO%j;F5+&9*r*s6GQMfRn*=MFKZ
z8{GAl%{#<&wsGchwU>(~AFOurl2=@uzWs2}!8wJ`#q2KpWIkn9#GAjk@9<mWgA8Y)
zGH)?AOcx1!xi?4W{G7&D{XPsvO@B6&+q2frQk@YL^=QS+H;beu95;Tq(y4@5{Y%Sa
zho{W7e9m*4er(<A!7KmEd&b|n$61b;&R%Th^)-d5)%e62=9@zEHfnkW@g!_wDOXS3
zFYrV5vd?<ARsYQxc%#^zXQdb{T#$BcTLSy4<oLu5uUdCG$~VhAO=<tmp7-KYop4&q
znr0ybW`pUIH)wU;XYbl5eeR9m?HUoD*ohZaw=!}kxFqy)D=fO=$e7DfAj<e{V#b-a
z(n(xSMfZ&lrddslJ263nhk-XVlHtb5)KwYsF2`p|wA~6-omeEs^es~OhgY>S+aFcc
z6-86Z<8mH-aK8S=`TM+^b4w0Q*pk`8zTSJyS-rJ~W``sMs~eng(_nwS)ytf98sA*u
z+IQxU*p8I5nA#}ZKPu}X;t+1DbZ80l($^bU4~TfWR0OJVWIf<fW!ZaY3-^*+$4WzI
zdG}s?D=FYxHZvfN&6!DEzW<n`#eq<bWv(JjKHHw%H9j;)bxshY*zyybdF|R%La!-4
z^|L)3kX}C3I4Zw`MbR|k@2PbgI((C^8=D5qdR8KSZq`)+$1T+>k`*H^>ea?N9_0M7
zcT#}<@1K{vc04<<DzM2sNU8ezj1@Cq-&l0M)TQI^N$s%SZE3%I+m5IlO5*TPa`QQ8
z#pIYcXR2Ss&zmC5!831v6rDN6CDvcaaVKL!U{dqctvt8=qo&+S4%U9&u(4%tLuyt{
zrOEllA3yw6F?zg5n<3)tdOz`vOly{e2>g=snf=J*W{fXyO#H6*s`q(WZ^flNt!un`
zKzW;oMxN~4#Ax=ChLn?2Uo5b0y1_Nc;0@Od^@@GTTWtHDh_Oh#e!Dm!SS9Jh1MY+q
zayzD_+7>^w|FLWK^g9Qe7lcjdWX?&?`7N`@%x`Dlx24QGB?aXdO5gE3?;m4zd%2Fe
zne3+$1Aa%=io~AA;u%F3zZ`wFseLW`F7^eSQKDysm#2GQG3CmhoK$3)&6*dp<iUbs
zO^Yimvi`cvYSlrWCD&quM5Zt-kYDkp!9i8Y|K*Duf!xr;+p_ZRN}p(Za?(UbYznW~
z#<@Y&vzgy5n6`0e;_9UfGhQxk^h)7cWzCo(7~KD*d3Rrx1Lpyj*cG9@EY3=@>qP7<
zT)Qt6ELiS(s8S^@^7k>$HFaXITQ`L_u6$9})bPvci|pR%T%Q;GminiBprQHYZa=m!
zhHJzQHSD$9lhSr8k8kUaME51>iR=@S*Ngw(YTG4dwD-lXbtm|^rhNz#m~S`B!J;6_
z<Nnpe7pCSl0h7#FdvaXYEoR|oZL-_HoguHp_2`~Jt}k8^y%lj^v@)kpVwcHw<cPV{
zf5So8dG?kVN1aDOiMC?N;^LwLZI8qij^wXYG6`%Jam<Y>xFz(R>1E%O31^wl>AOy{
zxcI;66ob{GeyeK=iCU&wCyn2>x}`e0R?VG}s}$NFEq8MHQHJ?z%)CBlXr1q3kny*F
z&)zw~?8@Hh_ZZV}lsb8u%1-nB@}VH({;5U5E?;ARXVi$8{}7Upm*&~b{Ic3Mw)2T=
z=>&PMM@-xc3e|KA_Mdvo%e8`4>P@=nyXl}Rc8bON9o>0rv=h!>ZCoJPv^~7*aKS6)
zS+5rrg|Pj%jZ)D#(AAe+a%s^q$Gv?!81pC1$~gGziy7zPE#8p_r~M5I>@>?OC>AQc
z$)FJ}edhHx7lD1Nown%)J$s<J)J%jwOJaTFqRnm_Q)k_MZL>dlG2`dU4@;c?uh{SC
zF~$3=fS~B7Ijej(d+kztmB=4<v29&>>Zagu%?}&%SFTZ#c29gbGeX?=`3?Jp2k%{8
zD7b`wDi?ooSOp*d74b(868P3ju^nxQao>LM_Ef#Lx&s0thaO)yYh>9KAt?M(qD}OH
zL*p;64yEkLi<oQl4fZIjzCP&F!l&n*ytuY}rXGveRjrE`4rOfbOjp^)`|s%Vhklyz
zDTg~bRan+L7MD037ELp-^*0gx%$&1i>1DaqNroR!+H73ibZT?sFX5D6w)N{=0tEw?
zc+5&Xrt(2&f`04m_S;Q<UW{5t4}T9;Ipy%w^wG>C;@khbgoGT~;aa)qgH+!Z`G-D}
z+T>5m>J%?Mo$_a+nfi+@O*MyIA0;PUF1>ZwRx|rNXRl8}s}|?WMbd)z+4Y+^mX%D5
zyC9Ui^n9}8qhp&-|9GL*D<PPeA?nWXF~x1=i{1+&3ta+@)Hysu#pa$q)*##5byB#a
z(c{)sspeS*XGK4@6rN}QdE`OJ94#r?sm(Ub_jUTNaT>K(+>SbVL3rch%X|zI|9jki
zz-M%;$?%45ysDIjr=_X{S4o(yWq^kL47R&QjFTjTg0~y|QhTf+{A!<KaO%?!vs#Ky
z`!k<T5&g*XZUT#mis)W3(PH0R2OBR}nHLVSYRxA)6wbEaS61$b$_|qdyUYD`N{9+)
zmcQOqx5T+k@4K9z32Dx3U6NAS!_al;%0=bB8pltbd$F3!Wko@wh!wB7`&sLvmXHOq
z+82(yr0}U_q@HP0(|NFQZ~v+blfNI|ckJ)nkB)O6NSuFMeB7ls>$$<5tb%}8*{yEu
zjW=2EeljQw<-MwSeevtAOUKx&4&`0%-M2haDC1J8<7t-4Bq0UP<mo+2t=5Q~`>!N)
zy7A5r4h3eGrsNw|v8S2*D$DsoHkVkm_8-dC;gb+v_#j3@*8LQxWb?@<3ahe|*0tWt
z;4fLk#9-ax_xi`tC0u(KoXZjvpZ8%_gvC9{gI{%S$CjGr9X=<0?ez~1hAZY$Stc#v
zOZRV6pQyUHYa(YOpOn$O%yQZAv`CJQKnI`eFI2iNTyifDG<}h4a$<tOVdc%c+8EpQ
zYg}9xRHiQ5)3@%A%Q0&i^^gwUBXLKT9&7pHFl&0$6qirmH61(4_OSBo%h||TCzz)6
zg_XOaeS^_SRvAVvh46-W@wg4ICT;nYaKpRjPhE(z(Sn6XN^?@<cv+=PRk}>uTO4Or
zh<Rwe%(&wFEcSBe7oHX__c|Vb#@yE;yANo2n7^8}q*-R`h9yy(nio8<?R0wj-DUk|
zuWj?X*SByUjA~$0jXSz8)#l*Mz_09*9EmQu^1ZXIGql!7rnNWO1Sl}s^dxvh#hO)=
zx+^Hw7e~CW`&qKzeZ6qS7NIE}$90<4+0GTH75QoV>OR|A6~VLXIl|H%7frjnY>L_0
zMyqRPE47{|t&|t#-yvYBx72i1-_pkRgCS=cN=_{_V!3ALl)6G#L1M4f#2p@!1)27C
zJjk`oeWD_j631TftD(o*b2&@TVmBe{#g2jo4PTv3hs4A$V0PS~y=m(E3FjT2OUzn6
z|HZ0vYj@XQYq@)LQOMzfQ@>rBr&+&lD4ngBQzg^pXPlHM%x!<Xh{0jMLj3aH`_EG(
zPJ2r$>neM9wys)qgt`2!;MD_%ZIxflX%K4VoVQuw6<@%Dg)w`rLQYwQ?!IbN+re?+
zAnOLBi><ty&M%5Kk$SQEwO_vv%eV3$-T#XBt4i$u{Nt;GnTXP_C7zS7&s6Sh-}0Gp
z#`5H+9v2u36g@Ux7A$PqUo>HcXM)Eo?k5ZdAwMTfzuytx!m^O@R$3*W&1`|yI`^+j
zEtg%d{PV}0L#*Z-d?(c_HmMb#`z9muBce27J@@V<1z(h_nER3<U(DCgZ*K8FAIbBr
zMKRWG*To|$@@;pl-o3gjmAOhWX5WcZAOF?v(_!2s+_I!^g4e7MZ7uHI+e6D&*i|H*
zea?G%BDY+}#DmH)o7)zxmim1Ddelv(U?yQ!efD?9`*h|$lWRz*a~3yo(Z0cUna#$`
zJ7v3JiEi7)+Y9BHKD4Vbc0DR~;rcfB)yAT8N*VKAav3+>ejxIPagXp?rF5yNWs3{;
zUAmiIHmB_B)n_6tyL80&9rir5g}ssMQ1^{Y$x~um+ca1Fwp`#I*!Ra+-0N<B>?~2<
zN|vPWE;B-m=kE3l|6hB}^sI5gkzcDDCM*mN%i9+0e4=#U!u>xFz1{Ns)=Z6U`J0(`
zKT;1rbFQSZ>)90cu&FmaLrtSO8-14b+;KYb_4$(OJeC`2tXB%191h=#{cg8wMRUR7
zIm`;X)nkv$jCi9x>0+v<SnCW2lSHLUTDAeXyWg;=GtHfGYsa%LPSd6hYQ}{Vs-|r3
z+udbyD`4%y+oeL6#W%m7_c~d!L{vgRS%pF3$hma~&9?_DEM>^w+Va6=YyN^GAC3x4
zU)LwPv$OU3rG-^XlRmx^^6EIGwt2-bw&FQHg|F8>JkPjmxy{7Zj>#U!SIuMivDDd)
z=d+;*6SwXGt$%M_Y@HRod|&y0(K=-LV3yaB*xEUjt(WUg-rIG*(J)~%Yt$;aojEW6
z&764r{HX(F+P}IFuY7Iox!j@q(0Rsfi&iWB_53#P)v5~;cWYW$r(8W0Fje~QJ!$Fc
z`64+SBB!_e9c&F;TeEQw%i9Y_BmX?P=jby3cXjF7x{%$!o$F72sF%<PdY%14);x`?
zdGcz#Pf4`_=LI(#H^dd>l%HTY&5+jYv@vm={KiJD|7W=`zB6AJ^St9<l=PaT^(VQU
zbsFPtFL*JD`O~l2OC;w%E{>hl-+pgjdHMJF-h1+^s`EE_GcYi=WI8(scse`7Mm8B3
zD(2KqwDmabAagW6cxjN9?3;iiiq4`e+>4a@qFR+gIJP>i=2M$q=Qz1d<>=AC0$qzA
z8zV{!3a?!~7%ISG?;taGj!5j1BmbASiW$nue1Cj*@A13V4jCac(!TaE&&r$qGR5i4
zv#_HFv{_gLk7+D2+T3I5>2<KU=I-I+*LPc-|77?5`HS$+V$3y4A9aj<W>+*<R9!Z+
zcrWZ8;ThI>zVo=xE`^WE*Qbi@FVx$m^WjX#OwaSe?j1*y#I<A3crA0Yag_-+o%^XZ
zr#tjq^qj3;y<6X(jF&j|TKja&a?2JKv5hR8N+MSR+*r*XZF#jM!sBw?p~LnseyJ8|
zKGABPn9LZOF(KCehy0&+*R*{6woG#3T=4y9p<P?!0lf=rtj~Sl_}Ijs;lFXg((*r7
z*$h5=R_$GUw6EcVSwZ35i&JbL6tQ>MNp8~IJ!$^301bxs>0f*;6CQ|htlL_Z{r>S6
z#uEYIE2SSi5RlLe`nK!%?%%tre}DJcy<a}$bJ1*H!@3&`47@U#ArU1JzCKpT`MG+D
zDfvmMdKI|^3?N`*Ur~^loSj;tkd&I9nP;o?e)oPQh0GLNrEpVU1K$GY)Qn7zs-o23
zD!-8As_bOT6eW8*E}IIgirj+S)RIJnirk#MVyg;UC9t_xdBs*BVSOb9u#%E&Tcrr!
z00rm#qErPFJrg|xUDt}tG9x8BE(M#Slr*a#7dNO8MJZ{vN*N_31y=g{<>lpi<;HsX
zMd|v6mX?<K21fcuM!H2QX}ZOgc_oPzx_QOQAR{1VxTF>*7iAWdWaj57fXqxx$}cUk
zRZ`+oP*8vxUXfei>kBtNuNWE%$@#hZ6^RA<hI$72xw-ntI*LnN%S!O;C=RJCNYxKY
zEzU13N=|hxOU)}$Mm8cP8Lq#ev?vGcos?w#)ST4Z)Vz{neM3D%6f505eFNY+KtYh6
znOgwXRgqhOqOv424G~x<z5&UAy@TwKirfOYxhSe(eg`WChmn;_esU?ud7dt|N+A2K
zQu32CQ>-A&<P^iCl$11GBU1wtT@#};OI=H23u9f26eEiyGvg%F#3W-RqdfD9OA_;v
zQ$a>m<QC{<W~NxB8JL=yn<tv-nwguY=$fP&B<d!mnx^R*8krj=S{R#}8yZ?58R1`)
znVy-Kn1k#pkWnd_DOQFiNk%3n2FAKZCMl`9CMFiix=99U7P=N`re>zeNh#(gMkZjR
zQj)FQ@{4j4OKg=ga}(23^$YUS!4jYVw{i^dv{f?FGeC$0<Rq4)<rn4JD)}ZREBFT^
zWI{4?Q-ezqLBVNgW@2J$U}<JyX=!R;VP=U?6qZ_4oSB~oGStvO59$U`yjb}cWv1qp
zB!UvEt&$;FM@4Rdm2**QVo82cNPd2ftrEyh3PyT{2H^CqU;~L2kIdqd{Gv)baFPaR
zoZ!?#2oI76ax%eE3JTzKYn7M`v7|V$EHwpekpfIAIU_MIJvGHv37Vo{;+a@tD>XIM
zBE`VmMAsxWF-6zJ(%f9vBF!LK*C5TzBstYA&B)Z!2-WoB{Irtt#G+Kk^whi(TP63*
z+yby~6f_`Vsfnt*JR=npPzFXux&}tNh6W*q=2nI#RwkC(28LD!21@!6KicSn@-@uM
zHu@NW0#Sfe5ZG}kK*WMv-0Zk)^ueVOsAPf|2r3z9iJ_4}ODhx<MlB&Jd`E+8G`L6#
z0g@DtrmoT8A}It&QaqZvs1{sYh%QfRUW%<!xstuzxo1l(85kJYlDyqr82*Fcg1yTp
zGcYi47I;J!Gca%qgD@k*tT_@43=Hfgp1!W^&zQIb_zX{-&;QTBAjRwH;uunK>+Rh1
zf~n!Np4UI;HP_-^=pdvd)o5t8jd8p3wvD!1oUMDRcbyIn-fMi>+BkN1^zOa!+p@N2
zXWPGdS2Ke*^zpiR^X7iM5&N!i`|Uzm0|Pz@W;F?x4viKeE{*$Nj%}8Ydl?t2t&rC1
zc<E>T!W~ub_rAA%{@?CrWnTi1)&JY`|F``6w_m{dZ?{X5LDO8J9cEm`47)fN&QKAV
zC^B`ahQ^ykD}E>^9krkR|M~x&*<XwpC)7N(7vqt)u8qmgidYopr^tUX>Ezk+e>MO7
z{~w>vn89#(`7FDzl)xDRFC7p5ll{NxxBmaH@ys3b_Wudrep3JcOND)_#oQCKJU72w
zn03~h?{BrMSZk)|tRoN3o9tg*IXQ~A_2q%rdp=BXD_Rkw+j?k=!JY7xnSIis+6xV2
zGiLhu2=CLs5~ShdufEes&@J(nz&dS{B_Y}i4QxH^Iqqm`_}uOb^j@%lV=)Rs<`^7K
zJag{&0S6cFgB;4iwGWnD@zXx!<0qDTGPmXZ-M+App1TDc-w#xuNa??o>pJ73z{X0K
zZMNQj{^c&noN+pQvIpNoxeDjE+cqVtIcPN5?U&l}VEN3cS7(^#IvmlylBa#hhe5mZ
zcHP9Bx&6xoqxOm!?tgbI>c`UZq<i0)e);liOf9ihy!_YVIRB&Eo&0-OSWGbLp0+@L
zFX#TJ+8@@uuIvA`D_7*tgX1rre*VD5?y+|>!}H10r?%|W`w;tQnz4m%dU2VrMN{B*
zE<w#*j3H@?7v1L{jM*fzcL`7N!6c{ccbA4-Dt&t9soI;z?h|JED3r#C&-7BVeZK4d
z?8@`SEn#ciB+@=KJy*Q!xpdMx?KvXn8s{!qB`y>d+JF0E*WT~WCwOAw`Pc2~J2CC|
z=2b$PAAePE{PrfGW#_w~XO{|t?EjZ9acX_AY^UI@#@?^r6Rzm6`11cqx}DM|b0GUi
zfZ(&XM%x<ayL}4RuRe~+I{xc}=~GorAD-=r`Y)Gib6#J6+<&RZ`#S#rmpUcCO1peF
z&JIbww0-A;)U6q&+7oB0{5z^_tapB?%9-svH?Q|xziyNKK3>qxSm0q2hwH(f20^DD
ziKUC@^?Zr_5K~~3uzX_Kqc#o(twS~02Pa4@$}x=k$+V?Q>Pzd^7oS&O^gb={k!g#E
zh+A*){ln)|K1}BPbFgmDJiR^MYky4FS8V?^q4w>Ghknma1uV04l@Qc*k1n)6*0puU
z>9AzIb*}ol?laUnUY=K(Ft6R-rsekC&fE8zZdWnxf6Eki+A}5p@|(EBmWf|pCHC<4
z3+yW8es-$r%quAujX!5^s?Oxe%jeIl=JvZBdFR;Sisj$Wcx^R(&AIsMJ->?A!7bPG
z4y;(ix8!7sbbj=YX{_6NOJXmuIGGD96i||x`DyRs50g3X%*&hedHF`WTKV@+^p;La
z>k2V6ukU}cZMi}AYqvL(KC%?<-d%7@?@?^l;rH)dmreH2X6_Tca%IND2Azu*QH7en
z{$%x>%KGv%G~**v%ev>nCUFiLaSf4s8!o)sn!=ZJtm^ml6E4dq8JNH6*IJ?U<-zw(
z+b^*_m7g~){1K>pO<L-ZRV~x+6LovKmrrDlJ#i#;gYabO^|Kh=L;@okH8h+>rY2um
z%NG)Jm+Q-;NeT-su8B<&vY&dys&>+q?E2>Vy7fwDc)vG$i3!)eVSU8^PcF(aF^{=c
zUf-~%^pCdD?)wMxt-5@^{`-GZa-oyU4uQb1=ACui3wg_v^x~}iK6zX}nrG$x>g)7^
z{&zDjZace1sYhdt;-4e(!u1u_Q6^??UvF6GihI<4a0?K~<E{Igw?WR$#rxv*9JQkV
zWlpQFEvWC^Q1-cU()#@^)i3r+dQ1IXo~>197M-O1@OYieLFN9%N4blnG^VN)XV{;d
z{$KsxM*ikATfgl8`F^_G4bDH`f^W3j9WD3WvZ?Y#Ypa5Z0Mp(jJZnqr^4!fgt$%y#
zPP@_>ldXrZiEG^Wr&Hyb`OP#xW5Sp8-5&p+xjxxG^GUIB#q#eDzo}h#7P@fyS?3Jp
zC7QF@H!9uPyj=0B_2)h3A|DE@t)21Wu>XST)1In$C(ZbhzWc<Ue@dS|?R;Gn|L)*+
zkA1(m*90Hm?E2E_dS}j#xgVJQn<ax=cFMWsJz1!3D6VsE+cb~UO0^G)jo$x}E!yyQ
z*S-1Wzk)Bl|0A{AQk?OcQsAQUeAoDmkw+8vm0nIgU3SQP?P<2FOP(jrwR8N{yMJ$4
zVwG{5#ww@PtDIeuPJ}S+U(RZI#dKf7>GHz<w<@uFCH8*#x#rZB=V#S7z0I8D+rF;)
z<%>CrJ=;>0ANEFn3YmDldghhc>lLj1<C^tN1Vm4B=GV5JkiGAyukFskt6BT!Amf_0
z!zpF^d+Q%2>=S>oq~P10-mN*N7k$f>d6*ZzZh3t@`Re`V>KD1LGx85>8|B^eS&`>@
zE^wpHrTK3TSbx2_RWajf)}r(OG%s4eb80Exslk|WQKHIK)$MIjQ2w5t>K}h?E}du;
zTccl=cx~;0HIWiEaW;NG-sSFazc<_P<~zyk!x^HdIo9vDJ>R-*_W9)6PtQbG-*DL?
zQ+qb7r`KOWE1W&>j<#Y@)6PoiiM_KwpP2N0=PtjBqghF}=ew`oo4ZG_<^k`V&&wzJ
z74$7L@NqgFzVK>Zh|sfJyId2$q`v0Rjh<;NYLsbIU8eLqYMENpSt}=gJKu`CYcn=l
zge5c2yk6f~|MJI`_p{^Oe{4IOaWTg4)a&<$<>j1?Jd#L#8oAhd%O^Fba=V7Bg;F!m
zmCs%KS6(=7v)taAxDPv9U0d?@&-b}(=Q<<%ndH$^hS%@Pwfu8G+p?^92k-A?Q}k|4
z>OC^=zv07Q(VL{#ALZV_|Muv6E7Mdt&()D_J2lF6mf7356g}U)L%n}NsIF4gd$U8U
zuQdp899G!#knfG{d&THaoR8)1_Fn#}Q<bTi@yjFp*{K6Z=P`cWYaFE7xrobY_3Pqq
zjgJ#dWe&Zcc}H8Q)%3``-@!_+&7XO4zN{=*+UKF%wJ#$x?%3^pH(EX)<=gYvx}a>o
zOV#z=70iEkZVw4td{sw!{W~LOi*!E)S@YG$zEp~4c$;ZRKf85jW8=OgTeq8g?gZby
z+*-b`@RZz=4~z8$;>x|_e7nsp9DZG%Tk*WlC$oghxG8Y2#&q#XLfiMMa=h=~aqiwv
zwmI9nci!f4zo0GNASd;`^4!N}59@S+*B_m}9Mzucwactr=4i}Tz5K^_zlrU+7CgB)
z=U|mm`Q7=G1%e*MWT}6Bmu*pf-)-6N^&jRYZZXtkfBE~zUfasxwND(x?>&8|ut=MQ
zqcJRs&q@A!Vcl)bJ&pfz%wmruy$Izln9{P7?Ujbe@ra=5wYQe$J}ld!_&Zv?*8j!3
z<4qA~PgL(&=y+-O{p0^$<Tv~7pX8n0@@dn33qGUC|7LNgu&(b_6KQqO)^YPuNPOZT
z9e4j}%&r4G3q_}DOfB){2#)HF3!8Vh#(wIN_gS;|#5nLLuUq3TUD&$x`NJ(H$?yMM
z4Xs%@Exbi_sr_1?&2t`oFj~J{`*-=m%#MnKJu@bmKIT{)s&l6L*58MTd*1bF+AQXM
zvGi%O)C1i&!tu4AorO$uQ(D~DJ@Q*N+2f^e#ZLPR)6G@AyImB6R&adoz5ij)DVyI%
z{Z%Lajh!4HAKNYQS~ODf&auPy|Ma?c3%VY?8Nn0ui2qA-y8i(&@%k6pWs?)xdP}+t
z?tkE&e)jz5uoSCSpD(_3wVsuE75!6wtQ4us|82frtNS_oq@14B@4tU<u;17+aT@Ch
z!zlmL?{|c>{A@E*lRDj5tI7P`#CE6kT2T>29_8{{HQtl;eq|LswnmRwpVs<Us#aB=
zWBX|Q^1!xPE~>G<kLMJv-aI>=@95MH4;up=#u(|DQZ9U@eiA=LHddT-o+R}0hU5Cr
zDHp!}Is5UiHv6k%tbRs6UVfRe!$)Jkpk7GFz6D}?EuO!u*lT;D@uaQ6+9f*o?-k}O
znH$zJbBa!@Y0Lay!i%=wZ;cCL+r?&7VRZK#-zE7!e9u2$U-#xyUzNdRn-iB#v8YJa
zu5wo7IIdVL`gGzxd6UQeqI}6$+BMekB{{q0S<Zd-`NR>G`wJx-rESBu-YUEBW<7`T
z$>#Wa@sDf!7ao1|bA7whi&j^T&y{U`Z{)5ss0kn5`J+{!BS1n>)6s8I`^1xpPhO;P
zH;Q#Cah;yXtQ)?tx8~268|TFvml!8MxcOphHivHf)a8A5iq$7}p0qXGyGZM}`1!;B
zs>}A&ox5$IBr@;L31OuVEnhy?d<*WJW4kc3!-GYMbuxGR>A4=-&sSz_w7B&sG(2-(
z#m~lFfs3R9UA9d55X=8`rSkT@qT5#%Ub-=%<E-=g8TM|xyMHwQHD2`f$u7ZTxi${Z
zUO3)4eRs!PSqt5>7Hh=|^}j#ZvVGFOM~@$<Oe$n~acZT6L$~;%siFRI3fZ>3^JSE$
z9!fm4J$Ggtug^4nKBJi@)O}RA+$4%mKX%F6XIj4Yb%ME>!tLcAp*m5M#VfxVYyNrX
zed@*BBH^lY6MkL&?-m^;FR^Q8$%J?P;!RVJS#L~tT73O|*5U0sUj!EiYwI|zj_N6|
zn)LpqRqO40T{{an519z2bzFG0^~U{5x#yR|mt`LAnZH!qDX}MdyHNF)mw$}9`^?^~
z-zO2yZY=ifmv6?zjR%h_?s;~(%OLztyZ7<+5j#xY+0K3bk)8blck{}7Rf&SX4n@h>
z+N|{0zVC)>#o4otUW^8(o(tanrc#%$ey?-x<si?07ZUz0yS`Ro%Oka(uC6^Mt))-A
z_Z+jGy!ufE>%w2rpSrHyotL+#_$O<~q7=hpYojlEot_xRwtqeQ{+}v!*Jr+7wJR-V
zThubP0zI=tJ&senE*3qJyJdD~nb!Tj*m?E-ME;X9d)sf6zjL0Uc;U-}sQ3JJKCk8m
z?OD8gdEWf5?m06q`j{kyU43#idCBX9xps|PKbr?ni<Bt;C+8OWZj0zl&&P9YXSy>9
zu2=YW$iMSWnYxoXLuX0spOmIA_xd;1eZL;;Wgxoaba&^HjnaHiuTGwEIxOkRea2rZ
z&P{VfW^Vsy_kvfdb5Gy3`(l4D`gi;}xZiburF7I;E0>Q>9aC6(zg_&4@apNI(u|`^
zE%URFJUBP;=+QhY_g}r!m%j-UQ0?Z--^IVS;El=$yE%V<2Kk*?ue{}1+Lj0zLB3<X
z86TN?euf@-SI-i-*~@cA=Hbl+{%;QN{Gzh(R%+x{k$WZb?`|gl5dY@C=%3$&nz#QI
z>V70Ubx&g{6j8iz`jqC4Zx;8SRWrX|wp!VPrz&nk;8RhFsRw;#<a8yzdA=<8M!NsR
zUtje<ob$W5HsKhD?T_Cr)7GBxE1R&bxAYH3-Rp@pnzQ7N$;&iMG&=XkJ;vFETO@Iv
zmo9I~gq!~*)6O2sIbvFKIckslJmtTymUbrV?CUOn<2-5os}t(=9vLq`#eCf_@ZzZI
zi=(P7*VoM6rugRDmkB>#G0fclkMCx28kc2WLe3q(FWJv|cHEsCvHRYP1Bw>@ul`>D
z`2JQ`hfA~FvI<5gjy1;~{}AujJ`^Kr#B9M{mbi9j>xo^_O}6Gdi)Oz&CNHP*`BuDd
zj{6V2cN4#R@O^!3_rc;}skDKXR<Y!>)q*95omK8v%T_->9o)bCI?tEc+XZj`i%BT&
z<$Sl){$}I-q7*01S2ch5cd(Z`Xf$z%F9_9VJ$xYhPQT2%9eLjN$;-`8xX53+dU3kW
z=_;Q?Jc%K?2R{4kF=kimy>)7z*qzI~7ISSYI$f?+xLt47<gUE#y~I4}3zzQi^7@L7
zGv~HXoG!II;;zB7Y3UvIf7@GLPkWwKWYd3UdiBXYU%h9nvbo~tP{lCw#j*V*Z2SLS
zDYdswd{$;xC3f!Mch7J=hw3LMW6l>9a(>M9S786Wyl3+X7xj1h?mv+I&$Bv9^41=y
zFRxrPR8u=LWK0C-q)zd9@Re2ZcawUZ{fX+{6&p2;&&_gtvC&@f-;3`Cr=CB(dNN{p
z-{iXQp-%#i_e6i2dADc2<bi(=RJUy6N-DP(2zkWW7#QgJX7~At5<7az-!yA`tnz!Z
z)9+95gElU~g%x_L4}U+f_E2x$_or`xYU(ZyQGuH^@ph3l@~?fAS6+`llz+=!x!v*n
zkC(hgH=Un-6~E|xs^iWkK|wCo<NW%oRKGpp_vHKT|H`sAobm7pP1k>+S2p~RtB_M*
z-ulc!Ipt^dp2@q@-#qycX;>Ee&2;jwtN)#}|M0hjt#f=)C6FE&+rR%W`;xl5_FKh^
zk7i62T%vpImifN<-7lx;xJ|jL(EhtgP<bDB-mEX~`Rp${3Rr%>(KLF$ujhVIh1>eC
zYa}Dp+IJW3{$)6A9oHL4MYmmC&maG`y4M=~|4&%R%f<R}-YJ)B8(EYynm$`uUkJ}t
zD!O0ZdFL~STdZx}A-A&m{9a0Wa)<wYDt>eL_lEy3MV~nQ?umaMX?o+P_0H}m(V`jW
z|8p!}r6$1lk!jI)yO#2mqUq<eFP}Ty@yW_1M<p$(?PB({C!+ITt1dkvSIxF}hsx}l
zDW}7fj5C9J=cnv<=i3(hT{EJ~Ao#%FPyZ+B%ymCF`TqH9D<nQY6R!SJ&0}u<DBi}x
zH1Jdwr~RK=r|kT*p%*f(qI9NB)iVeR|Gf2){=(Oe?T17}8@de4rQRgY@vn2=wW#aI
zwd0#E#uR(XPCUNP|J8K$<srVmURihE{hwjB**16W(_I#_Yj3pgn^CxY&Dq>T3`IMb
zv#-Cuuv%Ooc7NfLlV=o)UeCR;-KOXF)7g`ywnyzrnDb=D4en3Pa<5aEwlC&={lan1
z;_8pleTK6QtNRu6EPKAb<U8}K)v|iohK>_|Z+ptzHO+i=Alt6F^q-FbSMHH+v03w$
z_btgyoSSpt*DHp&VCA~wk||Xm+N=+T2|m+$C{rPx{WkZYV$?$er|X=$@vVXN`tK%|
ztDDU^U+?%yoH=FMdj3-etqLWd-@2IJo5}ljx9!~}_y6m@dssdr`$F2+^_$x_etUQ1
z?c0;aVP|{G{S{}${OMzx;~#(U-beEt>3wWMUQe8U=iPSQvuyDh*Nn}7*{hD*9mw3-
zP}2O&G;!99t)~T8L&N!k*6wM)vAJGmPMUpMNJs6ehp%phO!1nPxN7A`iHTdK1z6QG
zq6DlXWBSXD_CNPr9oN0B!gSFFiR6nxPOD!TieF8;oBguVLj2srnw^t(c3C<~eE(th
z=lFbQZ4RxgE*4Gu3N-JXoKwE!dj8S}?Dl+{uD11w^|9&wykVGnckYt%ea&yImU0-+
zez<+U!?K_NwavaoQJ#5ja!%?s*PR<zUHZxyoAJGf|K#@ng5MulpGiH_o7}OqeZJST
zRsT$DQ@D=I@QzV8e~|97$m6`Tm6_k?%AoxHUDaO}TUH<Vc}J<|eV@<$bG;nNZ#Xy3
zYyJE3_l)joNg-kEj5|w&)^BG1{ep20vvpI_a?7F_JC)9q>{)3%-{?=gzk=55176DQ
zyP96k>QX75Y;b84Q!k6-ssnQpcBSqTzj<eM#6k{d1KGqaiuVl+R%Klf%ayn;Tw*F9
zs(n#xje`W+z1Ftua=Xb&XG#m!>d#|;UuVE0z_dA!)%E|g{SUsz9ee%up!|!&@^9SL
z+9td-oGfL+8yL{k;nKWwcdKiL>(UphsvQ-M7edx^&gmBS_<K11VY!LMp)*{EWd6#$
zzqs5$YxU;l)-A2x23caPTet7)|Kk4d@2#4<7n$uYnzURfdaIFa#oi)$DDJ;(j_Zub
zMU$-jC;s`ccEN^K8#Hc9>z3HgXg(e~wZdOw^}(%Ey=K|wO=#WwSyU)&)``9S2_d2E
z!AnY%HTLegwQ}0N_7a&Tx$MbyelkZbKRjF$?{@L;87a%_I<<iTt@~c_^@N%WN9~;!
zaF@&F2bc3ycQ)}~D^==}B-Xz-%1gJ-yDYh<*!`pa+*wzrmK9s^DGSf7NatImzlK|B
z-!8+IvpxoU?)hhT=k(o*>9-1^^&iZ&?Ye)>Kz;GP;z<UJQVb^^uXp(}kNtC-WLo7U
zAC}_pQL{fr=|70G>Aru*Ao1(|6*0XXA_~>FkNN%yX_?7;fu|>0o`X+H-djwwuv$NP
zzD-;4FNu3cH~)CM{P;u%m(v&XZ#8X9V?K81)&q^C!$&f+7610@`&qGi3#Kjen!ZTt
zjOq52+20i<xTf6O&;I)J+#hRu4~i7sXEyHAi0jZ;c_?BlV{)qPvq@H8CK<V?2>Gzc
zf86%vQqdmo+b8#|;xOKw;C5lr&sfI1aP_!oV<jQy_??1lSFr3YVysH#tx7Ghn=B?J
z$^PkU;FrZ0w*D#n)Mc=lWhP79|ECIhMpZc<CM|6d``^uZ<l+@&+a=E%Uq6Tz^UF5=
zcCTL~F>P+U$(_c}SMBC(l`axqxX$GD(`=QGlRFc(fd&w7yWT18-I30Bw$p2m<xAC_
z$IB*H?Vt35xj#`aqU5OrkK?x6Z{Hos%spm#y`%b*Kwb9XIWJsieQr4@ckJFzp}1(_
zXS=K~tQKE1eM*vE?7Vsj4Q1U8x@RMf^FNlc7U0R9m#h-l!uUaFkFfPezc(&Zt_tn?
zzB1v)=NsN^zdYXGZ~l8!Z;x^Ha~G9x!8EHf&n$%**9?xGF5GSHx$i&Qx%B*Vs|sbi
z4DP$+EL*}>eDczrnT#(@UjCh*_`V|3Z}t4n1uIn<*6vWsKegTbLi_C>Q<b`v&ZNi%
zXjwSrfBAosr7nMYl*H0WYHjx`r+xW%p5yv@_g!)`5C8t4FBiydJn`4O?ym;IN<mHg
zii9o9?zJACAQ_OoNac*k37(ijjx9}_5=BJN5HdfFF)>8RGx3%H(^+w+Lbt@I3A5Bp
z>r1vQX*wkOKzYfukEv0*t%ph`Ofy=VY7^hv8!|&ING>+YYm+}{#(_h5YyXy>2m7^^
z-5z=s2wu8;$o}%Xy3bb@datYZ(Cs`Fk}>(#dGr6@9Hz5f$j|uxb;m!~tvX!7p3~A+
z?yorhnzx=UezwW4pO0792QB$1Zs@Di#UXgn_1goh)<{0i3I*GiElWI77ihQMc-i@)
i{??z{%(08F|FzFm6W?#WWr{Fpft{zTpUXO@geCxH#;Rig
delta 9019
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
diff --git a/views/cgscop_timesheet_sheet.xml b/views/cgscop_timesheet_sheet.xml
index 7673990..a609757 100644
--- a/views/cgscop_timesheet_sheet.xml
+++ b/views/cgscop_timesheet_sheet.xml
@@ -24,14 +24,17 @@
<record id="view_cgscop_timesheet_sheet_form" model="ir.ui.view">
<field name="name">cgscop.timesheet.sheet.form</field>
<field name="model">cgscop.timesheet.sheet</field>
- <field eval="25" name="priority"/>
+ <field name="priority" eval="25"/>
<field name="arch" type="xml">
<form>
+ <field name="company_id" invisible="1"/>
<header>
<button 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"/>
<button 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"/>
+ <button 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"/>
</header>
<sheet>
@@ -54,8 +57,12 @@
</group>
</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'}">
+ <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'}">
<tree editable="top">
+ <field name="company_id" invisible="1"/>
<field name="ur_id" invisible="1"/>
<field name="date"/>
<field name="employee_id" readonly="1"/>
diff --git a/views/hr_timesheet.xml b/views/hr_timesheet.xml
index 1cffd34..5f90a19 100644
--- a/views/hr_timesheet.xml
+++ b/views/hr_timesheet.xml
@@ -3,7 +3,7 @@
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo>
- <data noupdate="0">
+ <data>
<!--
Vues
@@ -82,10 +82,10 @@
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="analytic.view_account_analytic_line_form"/>
<field name="arch" type="xml">
- <xpath expr="//form/group" position="attributes">
- <attribute name="invisible">1</attribute>
+ <xpath expr="//sheet/group" position="attributes">
+ <attribute name="groups">base.group_system</attribute>
</xpath>
- <xpath expr="//form/group" position="after">
+ <xpath expr="//sheet/group" position="before">
<group string="Activité">
<field name="ur_id" options="{'no_open': True, 'no_create': True}" groups="cgscop_partner.group_cg_administrator"/>
<field name="employee_id" options="{'no_open': True, 'no_create': True}" required="True" groups="hr_timesheet.group_timesheet_manager"/>
@@ -172,7 +172,7 @@
date_start="date" mode="month"
quick_add="False"
color="project_id"
- readonly_form_view_id="cgscop_timesheet.view_cgscop_hr_timesheet_line_form">
+ form_view_id="cgscop_timesheet.view_cgscop_hr_timesheet_line_form">
<field name="calendar_l1"/>
<field name="calendar_l2"/>
</calendar>
@@ -183,11 +183,6 @@
Actions
-->
- <!-- Renomme l'action dans hr_timesheet -->
- <record id="hr_timesheet.menu_hr_time_tracking" model="ir.actions.act_window">
- <field name="name">Lignes de temps</field>
- </record>
-
<!-- Hérite l'action de la fenetre dans hr_timesheet -->
<record id="hr_timesheet.act_hr_timesheet_line" model="ir.actions.act_window">
<field name="name">Mes lignes de temps</field>
@@ -258,7 +253,7 @@ if records:
<field name="groups_id" eval="[(6,0, [ref('hr_timesheet.group_timesheet_manager'), ref('cgscop_partner.group_cg_administrator'), ref('cgscop_partner.group_ur_list_modif')])]"/>
</record>
- <!-- ajoute des droits pour gestionnaire uniquement sur le menu Toutes les feuilles de temps -->
+ <!-- ajoute des droits pour gestionnaire uniquement sur le menu Toutes les lignes de temps -->
<record model="ir.ui.menu" id="hr_timesheet.timesheet_menu_activity_all">
<field name="groups_id" eval="[(6,0, [ref('hr_timesheet.group_timesheet_manager'), ref('cgscop_partner.group_cg_administrator')])]"/>
</record>
@@ -268,12 +263,19 @@ if records:
action="timesheet_action_report_by_contact"
name="Par Contact"
sequence="25"/>
+ </data>
-
-
-
+ <data noupdate="0">
+ <!-- Modifie le nom des menus -->
+ <record id="hr_timesheet.menu_hr_time_tracking" model="ir.ui.menu">
+ <field name="name">Lignes de temps</field>
+ </record>
+ <record id="hr_timesheet.timesheet_menu_activity_mine" model="ir.ui.menu">
+ <field name="name">Mes lignes de temps</field>
+ </record>
</data>
+
<data noupdate="1">
- <delete id="hr_timesheet.timesheet_menu_report_timesheet_by_task" model="ir.ui.menu"/>
+ <delete id="hr_timesheet.timesheet_menu_report_timesheet_by_task" model="ir.ui.menu"/>
</data>
</odoo>
\ No newline at end of file
diff --git a/views/hr_timesheet_cgscop.xml b/views/hr_timesheet_cgscop.xml
index 3a6aa23..e2eeceb 100644
--- a/views/hr_timesheet_cgscop.xml
+++ b/views/hr_timesheet_cgscop.xml
@@ -131,7 +131,6 @@
<record id="act_cgscop_project_timesheet" model="ir.actions.act_window">
<field name="name">Codes activités UR</field>
<field name="res_model">project.project</field>
- <field name="view_type">form</field>
<field name="domain">[]</field>
<field name="view_mode">tree,kanban,form</field>
<field name="view_ids" eval="[(5, 0, 0),
--
GitLab