-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
54 changed files
with
916 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
Project Milestone Time Report Advanced | ||
====================================== | ||
This module allows on Projects module, when editing time report by Milestones, from the Smart button [Milestones time report], | ||
to see the following information (also available on PDF report): | ||
* Project status | ||
* Start date | ||
* End date | ||
* Todos | ||
|
||
Usage | ||
----- | ||
As a user, when I view the time by milestone report from a project form, the following additional columns are displayed: | ||
* Project status | ||
* Start date | ||
* End date | ||
* Todos | ||
|
||
.. image:: static/description/project_miestone_time_report.png | ||
|
||
.. image:: static/description/new_columns_milestone_time_report.png | ||
|
||
The lines of each project are grouped by stage (project_id.stage_id) and the groups are sorted in ascending order according to the sequence associated with the stages of the projects (project_id.stage_id.sequence). | ||
Within each of the groupings, the batch lines are sorted by start date. | ||
|
||
.. image:: static/description/sorting_and_grouping_on_report.png | ||
|
||
When I print the report to pdf, the report has these new columns, sorting and grouping. | ||
|
||
.. image:: static/description/pdf_report.png | ||
|
||
Contributors | ||
------------ | ||
* Numigi (tm) and all its contributors (https://bit.ly/numigiens) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# © 2023 Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
||
from . import report |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# © 2023 Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
||
{ | ||
"name": "Project Milestone Time Report Advanced", | ||
"version": "1.0.0", | ||
"author": "Numigi", | ||
"maintainer": "Numigi", | ||
"website": "https://bit.ly/numigi-com", | ||
"license": "AGPL-3", | ||
"category": "Project", | ||
"depends": [ | ||
"project_milestone_time_report", | ||
"project_milestone_time_kpi", | ||
"project_stage", | ||
], | ||
"summary": "Add new informations on Milestones time report.", | ||
"data": [ | ||
"report/report.xml", | ||
], | ||
"installable": True, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Translation of Odoo Server. | ||
# This file contains the translation of the following modules: | ||
# * project_milestone_time_report_advanced | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: Odoo Server 12.0\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"POT-Creation-Date: 2023-06-29 14:43+0000\n" | ||
"PO-Revision-Date: 2023-06-29 14:43+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: project_milestone_time_report_advanced | ||
#: model_terms:ir.ui.view,arch_db:project_milestone_time_report_advanced.report_body | ||
msgid "End" | ||
msgstr "Fin" | ||
|
||
#. module: project_milestone_time_report_advanced | ||
#: model:ir.model,name:project_milestone_time_report_advanced.model_project_milestone_time_report | ||
msgid "Milestone Time Report" | ||
msgstr "Rapport de temps des jalons" | ||
|
||
#. module: project_milestone_time_report_advanced | ||
#: model_terms:ir.ui.view,arch_db:project_milestone_time_report_advanced.report_body | ||
msgid "Start" | ||
msgstr "Début" | ||
|
||
#. module: project_milestone_time_report_advanced | ||
#: model_terms:ir.ui.view,arch_db:project_milestone_time_report_advanced.report_body | ||
msgid "Todos" | ||
msgstr "Reste à faire" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# © 2022 - Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). | ||
|
||
from . import report |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
# © 2022 Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). | ||
|
||
import datetime | ||
|
||
from odoo import api, models | ||
|
||
|
||
class ProjectMilestoneTimeReport(models.AbstractModel): | ||
_inherit = "project.milestone.time.report" | ||
|
||
@api.model | ||
def _get_project_line(self, project): | ||
res = super()._get_project_line(project) | ||
res["date_start"] = project.date_start | ||
res["date_end"] = project.date | ||
res["total_remaining_hours"] = project.total_remaining_hours | ||
res["stage"] = project.stage_id | ||
return res | ||
|
||
@api.model | ||
def get_rendering_variables(self, project): | ||
res = super().get_rendering_variables(project) | ||
res["stage_lines"] = self._get_project_stages(project) | ||
return res | ||
|
||
@api.model | ||
def _get_project_stages(self, project): | ||
lots = project.child_ids.filtered(lambda p: not p.lump_sum) | ||
projects = project | lots | ||
stage_ids = list(set([p.stage_id.id for p in projects])) | ||
stage_ids = ( | ||
self.env["project.stage"].browse(stage_ids).sorted(key=lambda p: p.sequence) | ||
) | ||
return [self._get_project_stage_line(s) for s in stage_ids] | ||
|
||
@api.model | ||
def _get_project_stage_line(self, stage): | ||
return { | ||
"stage": stage, | ||
} | ||
|
||
@api.model | ||
def _get_lines(self, project): | ||
super()._get_lines(project) | ||
lots = project.child_ids.filtered(lambda p: not p.lump_sum) | ||
projects = (project | lots).sorted( | ||
key=lambda a: (a.stage_id, (a.date_start or datetime.date(1970, 1, 1))) | ||
) | ||
return [self._get_project_line(p) for p in projects] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<odoo> | ||
<template id="report_body" inherit_id="project_milestone_time_report.report_body"> | ||
<!-- Start and End date --> | ||
<xpath expr="//table[hasclass('o_project_report__content')]/thead/tr[1]/th[1]" position="after"> | ||
<th class="text-right">Start</th> | ||
<th class="text-right">End</th> | ||
</xpath> | ||
<xpath expr="//table[hasclass('o_project_report__content')]/thead/tr[1]/th[last()]" position="after"> | ||
<th class="text-right">Todos</th> | ||
</xpath> | ||
<!-- Stage grouping --> | ||
<xpath expr="//table[hasclass('o_project_report__content')]/tbody" position="replace"> | ||
<tbody> | ||
<tr t-foreach="stage_lines" t-as="stage_line" style="background-color: #d9d8d7;"> | ||
<t t-set="stage" t-value="stage_line['stage']"/> | ||
<td style="padding-left: 7px; font-size: 13px; color: blue; font-weight: bold;"> | ||
<span t-raw="stage.display_name"/> | ||
</td> | ||
<td></td> | ||
<td></td> | ||
<td></td> | ||
<td></td> | ||
<td></td> | ||
<td></td> | ||
|
||
<tr t-foreach="lines" t-as="line"> | ||
<t t-set="project" t-value="line['project']"/> | ||
<t t-if="project.stage_id == stage"> | ||
<td> | ||
<span t-raw="project.display_name"/> | ||
</td> | ||
<td class="text-right"> | ||
<span t-raw="line['date_start']" t-options="{'widget': 'date'}"/> | ||
</td> | ||
<td class="text-right"> | ||
<span t-raw="line['date_end']" t-options="{'widget': 'date'}"/> | ||
</td> | ||
<td | ||
class="text-right o_project_report__amount o_project_report__estimated_hours" | ||
t-att-project-id="project.id" | ||
> | ||
<span t-raw="line['total_estimated_hours']" t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
<td | ||
class="text-right o_project_report__amount o_project_report__consumed_hours" | ||
t-att-project-id="project.id" | ||
> | ||
<span t-raw="line['consumed_hours']" t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
<td class="text-right"> | ||
<span t-raw="line['budget_remaining']" t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
<td class="text-right"> | ||
<span t-raw="line['total_remaining_hours']" t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
</t> | ||
</tr> | ||
</tr> | ||
<tr class="o_project_report__totals"> | ||
<td></td> | ||
<td></td> | ||
<td></td> | ||
<td | ||
class="text-right o_project_report__amount o_project_report__total_estimated_hours" | ||
> | ||
<span t-raw="sum(l['total_estimated_hours'] for l in lines)" | ||
t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
<td | ||
class="text-right o_project_report__amount o_project_report__total_consumed_hours" | ||
> | ||
<span t-raw="sum(l['consumed_hours'] for l in lines)" | ||
t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
<td class="text-right"> | ||
<span t-raw="sum(l['budget_remaining'] for l in lines)" | ||
t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
<td class="text-right"> | ||
<span t-raw="sum(l['total_remaining_hours'] for l in lines)" | ||
t-options="{'widget': 'float_time'}"/> | ||
</td> | ||
</tr> | ||
</tbody> | ||
</xpath> | ||
</template> | ||
|
||
</odoo> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+63.2 KB
...e_time_report_advanced/static/description/new_columns_milestone_time_report.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+65.5 KB
project_milestone_time_report_advanced/static/description/pdf_report.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+198 KB
...estone_time_report_advanced/static/description/project_miestone_time_report.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+70.7 KB
...tone_time_report_advanced/static/description/sorting_and_grouping_on_report.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
Project Progress Variance | ||
========================= | ||
This module allows to: | ||
|
||
* Add the ”Variance on progress” field in the form view of a task | ||
Computed as : task real progress + task theorical progress. | ||
|
||
.. image:: static/description/task_progress_variance.png | ||
|
||
* Add the “Variance on progress” in the analysis list view “Progress of tasks” | ||
|
||
.. image:: static/description/task_progress_report.png | ||
|
||
* Add the ”Progress” tab in the form view of a project | ||
* The “Total theoretical progress” field | ||
Computed as : total of effective hours of project tasks / total of planned hours of project tasks. | ||
|
||
* The "Total real progress" field | ||
Computed as : total of effective hours of project tasks / total of projected hours of project tasks. | ||
|
||
* The “Total variance on progress” field | ||
Computed as : total of real progress - Total theoretical progress. | ||
|
||
.. image:: static/description/project_progress_tab.png | ||
|
||
Contributors | ||
------------ | ||
* Numigi (tm) and all its contributors (https://bit.ly/numigiens) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# © 2023 Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
||
from . import models |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# © 2023 Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
||
{ | ||
"name": "Project Progress Variance", | ||
"version": "1.0.1", | ||
"author": "Numigi", | ||
"maintainer": "Numigi", | ||
"website": "https://bit.ly/numigi-com", | ||
"license": "AGPL-3", | ||
"category": "Project", | ||
"depends": ["project_projected_hours"], | ||
"summary": "Add some progress variance time on task and project", | ||
"data": [ | ||
"views/project_project.xml", | ||
"views/project_task.xml", | ||
"views/project_task_progress_report.xml", | ||
], | ||
"installable": True, | ||
} |
Oops, something went wrong.