Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker_files/main/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions gitoo.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
47 changes: 0 additions & 47 deletions hr_timesheet_project_parent/i18n/fr.po

This file was deleted.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
47 changes: 47 additions & 0 deletions hr_timesheet_project_parent_enhanced/i18n/fr.po
Original file line number Diff line number Diff line change
@@ -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."
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading