TA#72157 [16.0][ADD][IMP] hr_timesheet_project_parent_enhanced (#57)

* TA#72157 [16.0][ADD][IMP] hr_timesheet_project_parent_enhanced
Numigi · Jan 17, 2025 · 86b2b0d · 86b2b0d
1 parent b9d7461
commit 86b2b0d
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 57 deletions.
diff --git a/.docker_files/main/__manifest__.py b/.docker_files/main/__manifest__.py
@@ -11,7 +11,7 @@
     "category": "Other",
     "summary": "Install all addons required for testing.",
     "depends": [
-        "hr_timesheet_project_parent",
+        "hr_timesheet_project_parent_enhanced",
         "project_timesheet_time_control_sheet",
     ],
     "installable": True,

diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS
 
 USER odoo
 
-COPY hr_timesheet_project_parent  /mnt/extra-addons/hr_timesheet_project_parent
+COPY hr_timesheet_project_parent_enhanced  /mnt/extra-addons/hr_timesheet_project_parent_enhanced
 COPY project_timesheet_time_control_sheet  /mnt/extra-addons/project_timesheet_time_control_sheet
 
 COPY .docker_files/main /mnt/extra-addons/main

diff --git a/gitoo.yml b/gitoo.yml
@@ -1,3 +1,8 @@
+- url: https://github.com/Numigi/odoo-project-addons
+  branch: "16.0"
+  includes:
+    - project_parent_enhanced
+
 - url: https://github.com/OCA/project
   branch: "16.0"
   includes:

diff --git a/hr_timesheet_project_parent/i18n/fr.po b/hr_timesheet_project_parent/i18n/fr.po
diff --git a/hr_timesheet_project_parent/static/description/error_change_parent_id.png b/hr_timesheet_project_parent/static/description/error_change_parent_id.png
diff --git a/hr_timesheet_project_parent/static/description/hr_timesheet_search_view.png b/hr_timesheet_project_parent/static/description/hr_timesheet_search_view.png
diff --git a/hr_timesheet_project_parent/README.rst → ...esheet_project_parent_enhanced/README.rst b/hr_timesheet_project_parent/README.rst → ...esheet_project_parent_enhanced/README.rst
@@ -1,4 +1,4 @@
-Hr Timesheet Project Parent
+Hr Timesheet Project Parent Enhanced
 ====================================
 
 This module adds constraints and features related to timesheets and parent-child relationships between projects. It enhances the existing functionalities provided by the OCA module `project_parent`, with a focus on timesheets and their integration into project hierarchies.
@@ -27,7 +27,12 @@ Features
 .. image:: static/description/error_change_parent_id.png
 
 **Enhanced Views**
-    - Displays the parent project in analytic line views for better visibility.
+    - Displays the parent project in analytic line views for better visibility (either in list or form view).
+    eg. : `My parent project, My iteration`
+
+.. image:: static/description/parent_project_name_list_view.png
+
+.. image:: static/description/parent_project_name_form_view.png
 
     - Allows filtering timesheets based on the parent project.
 

diff --git a/hr_timesheet_project_parent/__init__.py → ...sheet_project_parent_enhanced/__init__.py b/hr_timesheet_project_parent/__init__.py → ...sheet_project_parent_enhanced/__init__.py
diff --git a/hr_timesheet_project_parent/__manifest__.py → ...t_project_parent_enhanced/__manifest__.py b/hr_timesheet_project_parent/__manifest__.py → ...t_project_parent_enhanced/__manifest__.py
@@ -2,14 +2,18 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 {
-    "name": "Hr Timesheet Project Parent",
+    "name": "Hr Timesheet Project Parent Enhanced",
     "version": "16.0.1.0.0",
     "author": "Numigi",
     "maintainer": "Numigi",
     "website": "https://bit.ly/numigi-com",
     "license": "LGPL-3",
     "category": "Project",
-    "depends": ["hr_timesheet", "project_parent"],
+    "summary": """
+        Adds constraints and features related to timesheets
+        and parent-child relationships between projects.
+    """,
+    "depends": ["hr_timesheet", "project_parent_enhanced"],
     "data": [
         "views/account_analytic_line_views.xml",
     ],

diff --git a/hr_timesheet_project_parent_enhanced/i18n/fr.po b/hr_timesheet_project_parent_enhanced/i18n/fr.po
@@ -0,0 +1,47 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_timesheet_project_parent_enhanced
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-01-13 06:49+0000\n"
+"PO-Revision-Date: 2025-01-13 06:49+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: hr_timesheet_project_parent_enhanced
+#: model:ir.model,name:hr_timesheet_project_parent_enhanced.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Ligne analytique"
+
+#. module: hr_timesheet_project_parent_enhanced
+#: model:ir.model.fields,field_description:hr_timesheet_project_parent_enhanced.field_account_analytic_line__project_id
+msgid "Iteration"
+msgstr "Projet"
+
+#. module: hr_timesheet_project_parent_enhanced
+#: model:ir.model.fields,field_description:hr_timesheet_project_parent_enhanced.field_account_analytic_line__parent_project_id
+msgid "Parent Project"
+msgstr "Projet parent"
+
+#. module: hr_timesheet_project_parent_enhanced
+#: model:ir.model,name:hr_timesheet_project_parent_enhanced.model_project_project
+msgid "Project"
+msgstr "Projet"
+
+#. module: hr_timesheet_project_parent_enhanced
+#. odoo-python
+#: code:addons/hr_timesheet_project_parent_enhanced/models/project_project.py:0
+#, python-format
+msgid ""
+"Timesheet already exists on this project, to update the Parent Project "
+"field, the Project must have no Timesheets."
+msgstr ""
+"Une feuille de temps existe déjà pour ce projet. Pour modifier le champ "
+"Projet Parent, le projet ne doit avoir aucune feuille de temps."
diff --git a/...mesheet_project_parent/models/__init__.py → ...roject_parent_enhanced/models/__init__.py b/...mesheet_project_parent/models/__init__.py → ...roject_parent_enhanced/models/__init__.py
diff --git a/...ct_parent/models/account_analytic_line.py → ..._enhanced/models/account_analytic_line.py b/...ct_parent/models/account_analytic_line.py → ..._enhanced/models/account_analytic_line.py
diff --git a/..._project_parent/models/project_project.py → ...parent_enhanced/models/project_project.py b/..._project_parent/models/project_project.py → ...parent_enhanced/models/project_project.py
diff --git a/hr_timesheet_project_parent_enhanced/static/description/error_change_parent_id.png b/hr_timesheet_project_parent_enhanced/static/description/error_change_parent_id.png
diff --git a/...mesheet_project_parent_enhanced/static/description/hr_timesheet_search_view.png b/...mesheet_project_parent_enhanced/static/description/hr_timesheet_search_view.png
diff --git a/...roject_parent/static/description/icon.png → ...rent_enhanced/static/description/icon.png b/...roject_parent/static/description/icon.png → ...rent_enhanced/static/description/icon.png
diff --git a/...et_project_parent_enhanced/static/description/parent_project_name_form_view.png b/...et_project_parent_enhanced/static/description/parent_project_name_form_view.png
diff --git a/...et_project_parent_enhanced/static/description/parent_project_name_list_view.png b/...et_project_parent_enhanced/static/description/parent_project_name_list_view.png
diff --git a/...imesheet_project_parent/tests/__init__.py → ...project_parent_enhanced/tests/__init__.py b/...imesheet_project_parent/tests/__init__.py → ...project_parent_enhanced/tests/__init__.py
diff --git a/...arent/tests/test_account_analytic_line.py → ...anced/tests/test_account_analytic_line.py b/...arent/tests/test_account_analytic_line.py → ...anced/tests/test_account_analytic_line.py
diff --git a/...ent/views/account_analytic_line_views.xml → ...ced/views/account_analytic_line_views.xml b/...ent/views/account_analytic_line_views.xml → ...ced/views/account_analytic_line_views.xml
@@ -4,21 +4,21 @@
     <record id="view_account_analytic_line_filter" model="ir.ui.view">
         <field name="name">Analytic Line Search With Parent Project</field>
         <field name="model">account.analytic.line</field>
-        <field name="inherit_id" ref="analytic.view_account_analytic_line_filter"/>
+        <field name="inherit_id" ref="analytic.view_account_analytic_line_filter" />
         <field name="arch" type="xml">
             <field name="account_id" position="after">
-                <field name="parent_project_id"/>
+                <field name="parent_project_id" />
             </field>
         </field>
     </record>
 
     <record id="hr_timesheet_line_search" model="ir.ui.view">
         <field name="name">Timesheet Line Search With Parent Project</field>
         <field name="model">account.analytic.line</field>
-        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
+        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search" />
         <field name="arch" type="xml">
             <field name="project_id" position="after">
-                <field name="parent_project_id"/>
+                <field name="parent_project_id" />
             </field>
         </field>
     </record>