diff --git a/project_workload_additions/README.rst b/project_workload_additions/README.rst new file mode 100644 index 00000000..0c0898ce --- /dev/null +++ b/project_workload_additions/README.rst @@ -0,0 +1,67 @@ +========================== +Project Workload Additions +========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:f160d5c351f92880cfcdf26467249bc9d536b0509cb5f7b8a93c574eeac84591 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github + :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_additions + :alt: akretion/ak-odoo-incubator + +|badge1| |badge2| |badge3| + +This module adds additional workloads in tasks. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier + +Maintainers +~~~~~~~~~~~ + +This module is part of the `akretion/ak-odoo-incubator `_ project on GitHub. + +You are welcome to contribute. diff --git a/project_workload_additions/models/project_task_workload_addition.py b/project_workload_additions/models/project_task_workload_addition.py index fc50ab53..75652c0c 100644 --- a/project_workload_additions/models/project_task_workload_addition.py +++ b/project_workload_additions/models/project_task_workload_addition.py @@ -39,10 +39,11 @@ def name_get(self): result.append( ( record.id, - _( - "%s additional workload (%d%%)" - % (record.task_id.name, record.percentage) - ), + _("%(task)s additional workload (%(percentage)d%%)") + % { + "task": record.task_id.name, + "percentage": record.percentage, + }, ) ) return result diff --git a/project_workload_additions/readme/CONTRIBUTORS.rst b/project_workload_additions/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..292f457e --- /dev/null +++ b/project_workload_additions/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier diff --git a/project_workload_additions/readme/DESCRIPTION.rst b/project_workload_additions/readme/DESCRIPTION.rst new file mode 100644 index 00000000..fb3e4465 --- /dev/null +++ b/project_workload_additions/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds additional workloads in tasks. diff --git a/project_workload_additions/static/description/index.html b/project_workload_additions/static/description/index.html new file mode 100644 index 00000000..531b235a --- /dev/null +++ b/project_workload_additions/static/description/index.html @@ -0,0 +1,424 @@ + + + + + +Project Workload Additions + + + +
+

Project Workload Additions

+ + +

Alpha License: AGPL-3 akretion/ak-odoo-incubator

+

This module adds additional workloads in tasks.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
  • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is part of the akretion/ak-odoo-incubator project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/project_workload_milestone/README.rst b/project_workload_milestone/README.rst new file mode 100644 index 00000000..15968256 --- /dev/null +++ b/project_workload_milestone/README.rst @@ -0,0 +1,67 @@ +========================== +Project Workload Milestone +========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:963931779fa5135c8ec9245b45c21251fe06d687dc681bec0bea93a13ff80f36 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github + :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_milestone + :alt: akretion/ak-odoo-incubator + +|badge1| |badge2| |badge3| + +This module makes tasks inherit milestones start and end dates. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier + +Maintainers +~~~~~~~~~~~ + +This module is part of the `akretion/ak-odoo-incubator `_ project on GitHub. + +You are welcome to contribute. diff --git a/project_workload_milestone/models/project_milestone.py b/project_workload_milestone/models/project_milestone.py index ac880d87..2013baf8 100644 --- a/project_workload_milestone/models/project_milestone.py +++ b/project_workload_milestone/models/project_milestone.py @@ -11,7 +11,6 @@ class ProjectMilestone(models.Model): _inherit = "project.milestone" start_date = fields.Date( - string="Start Date", help="The date when the Milestone should start.", compute="_compute_milestone_start_date", store=True, diff --git a/project_workload_milestone/readme/CONTRIBUTORS.rst b/project_workload_milestone/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..292f457e --- /dev/null +++ b/project_workload_milestone/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier diff --git a/project_workload_milestone/readme/DESCRIPTION.rst b/project_workload_milestone/readme/DESCRIPTION.rst new file mode 100644 index 00000000..9aaf0290 --- /dev/null +++ b/project_workload_milestone/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module makes tasks inherit milestones start and end dates. diff --git a/project_workload_milestone/static/description/index.html b/project_workload_milestone/static/description/index.html new file mode 100644 index 00000000..8ab79a4b --- /dev/null +++ b/project_workload_milestone/static/description/index.html @@ -0,0 +1,424 @@ + + + + + +Project Workload Milestone + + + +
+

Project Workload Milestone

+ + +

Alpha License: AGPL-3 akretion/ak-odoo-incubator

+

This module makes tasks inherit milestones start and end dates.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
  • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is part of the akretion/ak-odoo-incubator project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/project_workload_timesheet/README.rst b/project_workload_timesheet/README.rst new file mode 100644 index 00000000..34c36503 --- /dev/null +++ b/project_workload_timesheet/README.rst @@ -0,0 +1,67 @@ +========================== +Project Workload Timesheet +========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:b5ef5651db27343b28f51a36a2f4861a7bb7140f293ac5b3700c16853bf1354a + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github + :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet + :alt: akretion/ak-odoo-incubator + +|badge1| |badge2| |badge3| + +This module adds workloads directly in timesheets. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier + +Maintainers +~~~~~~~~~~~ + +This module is part of the `akretion/ak-odoo-incubator `_ project on GitHub. + +You are welcome to contribute. diff --git a/project_workload_timesheet/models/account_analytic_line.py b/project_workload_timesheet/models/account_analytic_line.py index 11fbd182..9fe1cc63 100644 --- a/project_workload_timesheet/models/account_analytic_line.py +++ b/project_workload_timesheet/models/account_analytic_line.py @@ -25,7 +25,6 @@ class AccountAnalyticLine(models.Model): ) week = fields.Char( - string="Week", compute="_compute_week", help="Week number of the year", ) diff --git a/project_workload_timesheet/models/hr_timesheet_sheet.py b/project_workload_timesheet/models/hr_timesheet_sheet.py index ddde32e1..cc812ef5 100644 --- a/project_workload_timesheet/models/hr_timesheet_sheet.py +++ b/project_workload_timesheet/models/hr_timesheet_sheet.py @@ -20,18 +20,15 @@ class Sheet(models.Model): ) next_week_load = fields.Float( - "Next Week Load", compute="_compute_next_week_load", help="The workload of the next week", ) next_week_units_count = fields.Integer( - "Next Week Units Count", compute="_compute_next_week_load", help="The number of workload units of the next week", ) current = fields.Boolean( - "Current", compute="_compute_current", help="Is this the current timesheet", ) @@ -153,7 +150,7 @@ def _prepare_new_line(self, line): def action_timesheet_done(self): self.ensure_one() - super().action_timesheet_done() + rv = super().action_timesheet_done() next_week = week_name(self.date_start + timedelta(days=7)) next_week_units = self.env["project.workload.unit"].search( @@ -191,3 +188,5 @@ def action_timesheet_done(self): # The unit are now done so the unit hours are the timesheeted hours unit.hours = unit.timesheeted_hours + + return rv diff --git a/project_workload_timesheet/models/project_workload_unit.py b/project_workload_timesheet/models/project_workload_unit.py index 8147b325..6d568d79 100644 --- a/project_workload_timesheet/models/project_workload_unit.py +++ b/project_workload_timesheet/models/project_workload_unit.py @@ -17,23 +17,18 @@ class ProjectWorkloadUnit(models.Model): priority = fields.Selection(related="task_id.priority") timesheeted_hours = fields.Float( - "Timesheeted Hours", compute="_compute_timesheeted_hours", help="The hours timesheeted on this workload", ) remaining_hours = fields.Float( - "Remaining Hours", compute="_compute_remaining_hours", help="The remaining hours to timesheet on this workload (can be negative)", ) progress = fields.Float( - "Progress", compute="_compute_progress", help="The progress of the task", ) - force_done = fields.Boolean( - "Force Done", - ) + force_done = fields.Boolean() task_stage_id = fields.Many2one( related="task_id.stage_id", string="Task Stage", readonly=False ) diff --git a/project_workload_timesheet/readme/CONTRIBUTORS.rst b/project_workload_timesheet/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..292f457e --- /dev/null +++ b/project_workload_timesheet/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier diff --git a/project_workload_timesheet/readme/DESCRIPTION.rst b/project_workload_timesheet/readme/DESCRIPTION.rst new file mode 100644 index 00000000..6245425c --- /dev/null +++ b/project_workload_timesheet/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds workloads directly in timesheets. diff --git a/project_workload_timesheet/static/description/index.html b/project_workload_timesheet/static/description/index.html new file mode 100644 index 00000000..8d017e2c --- /dev/null +++ b/project_workload_timesheet/static/description/index.html @@ -0,0 +1,424 @@ + + + + + +Project Workload Timesheet + + + +
+

Project Workload Timesheet

+ + +

Alpha License: AGPL-3 akretion/ak-odoo-incubator

+

This module adds workloads directly in timesheets.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
  • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is part of the akretion/ak-odoo-incubator project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/project_workload_timesheet_additions/README.rst b/project_workload_timesheet_additions/README.rst new file mode 100644 index 00000000..7ec95bb6 --- /dev/null +++ b/project_workload_timesheet_additions/README.rst @@ -0,0 +1,67 @@ +==================================== +Project Workload Timesheet Additions +==================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:97cfdb2d70cb1fe62e8ab5f97743010162073b756b494792ce81a0ed541583b5 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github + :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet_additions + :alt: akretion/ak-odoo-incubator + +|badge1| |badge2| |badge3| + +This module adds additional workloads support in timesheets. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier + +Maintainers +~~~~~~~~~~~ + +This module is part of the `akretion/ak-odoo-incubator `_ project on GitHub. + +You are welcome to contribute. diff --git a/project_workload_timesheet_additions/readme/CONTRIBUTORS.rst b/project_workload_timesheet_additions/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..292f457e --- /dev/null +++ b/project_workload_timesheet_additions/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Akretion `_: + * BEAU Sébastien + * Florian Mounier diff --git a/project_workload_timesheet_additions/readme/DESCRIPTION.rst b/project_workload_timesheet_additions/readme/DESCRIPTION.rst new file mode 100644 index 00000000..b8dc49f0 --- /dev/null +++ b/project_workload_timesheet_additions/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds additional workloads support in timesheets. diff --git a/project_workload_timesheet_additions/static/description/index.html b/project_workload_timesheet_additions/static/description/index.html new file mode 100644 index 00000000..8b96008e --- /dev/null +++ b/project_workload_timesheet_additions/static/description/index.html @@ -0,0 +1,424 @@ + + + + + +Project Workload Timesheet Additions + + + +
+

Project Workload Timesheet Additions

+ + +

Alpha License: AGPL-3 akretion/ak-odoo-incubator

+

This module adds additional workloads support in timesheets.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
  • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is part of the akretion/ak-odoo-incubator project on GitHub.

+

You are welcome to contribute.

+
+
+
+ +