Merge pull request #1090 from OCA/17.0

Syncing from upstream OCA/project (17.0)
brain-tec · Dec 20, 2024 · e80f594 · e80f594
2 parents 5e38c24 + f84fd30
commit e80f594
Show file tree

Hide file tree

Showing 11 changed files with 668 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ addon | version | maintainers | summary
 [project_timeline](project_timeline/) | 17.0.1.1.1 |  | Timeline view for projects
 [project_timesheet_time_control](project_timesheet_time_control/) | 17.0.1.0.1 | [![ernestotejeda](https://github.com/ernestotejeda.png?size=30px)](https://github.com/ernestotejeda) | Project timesheet time control
 [project_type](project_type/) | 17.0.1.0.2 |  | Project Types
-[sale_project_task_recurrency](sale_project_task_recurrency/) | 17.0.1.1.0 |  | Configuring Task Recurrence from the Product Form.
+[sale_project_task_recurrency](sale_project_task_recurrency/) | 17.0.1.2.0 |  | Configuring Task Recurrence from the Product Form.
 
 [//]: # (end addons)
 

diff --git a/sale_project_task_recurrency/README.rst b/sale_project_task_recurrency/README.rst
@@ -7,7 +7,7 @@ Sale project task recurrency
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:333fe55af0b7c235786aba0f66d75dfd763960781b34f0701bf3548783f2793e
+   !! source digest: sha256:d5da2188db2ac87ba6c4ebb660e25aa1e53a534b122f01791f97e48ae666a311
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_project_task_recurrency/__manifest__.py b/sale_project_task_recurrency/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Sale project task recurrency",
-    "version": "17.0.1.1.0",
+    "version": "17.0.1.2.0",
     "summary": "Configuring Task Recurrence from the Product Form.",
     "author": "Tecnativa,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/project",

diff --git a/sale_project_task_recurrency/i18n/es.po b/sale_project_task_recurrency/i18n/es.po
@@ -68,17 +68,49 @@ msgstr "Fin del próximo período"
 msgid "February"
 msgstr "Febrero"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__5
+msgid "Fifth month"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__1
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__1
+msgid "First month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month_quarter
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month_semester
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month_quarter
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month_semester
 msgid "Force Month"
 msgstr "Forzar mes"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_force_month_quarter
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_force_month_quarter
+msgid "Force the month to be used inside the quarter"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_force_month_semester
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_force_month_semester
+msgid "Force the month to be used inside the semester"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_type__forever
 msgid "Forever"
 msgstr "Para siempre"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__4
+msgid "Fourth month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__recurring_task
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__recurring_task
@@ -135,6 +167,11 @@ msgstr "Producto"
 msgid "Product Variant"
 msgstr "Variante"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_unit__quarter
+msgid "Quarters"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_type__repeat
 msgid "Repeat"
@@ -151,11 +188,27 @@ msgstr "Repetir cada"
 msgid "Sales Order Line"
 msgstr "Línea de orden de venta"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__2
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__2
+msgid "Second month"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_unit__semester
+msgid "Semesters"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month__9
 msgid "September"
 msgstr "Septiembre"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__6
+msgid "Sixth month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_start_date_method
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_start_date_method
@@ -178,6 +231,12 @@ msgstr "Inicio del próximo período"
 msgid "Task Repeat Unit"
 msgstr "Repetir tarea hasta"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__3
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__3
+msgid "Third month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_start_date_method
 #: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_start_date_method

diff --git a/sale_project_task_recurrency/i18n/it.po b/sale_project_task_recurrency/i18n/it.po
@@ -68,17 +68,49 @@ msgstr "Fine del periodo successivo"
 msgid "February"
 msgstr "Febbraio"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__5
+msgid "Fifth month"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__1
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__1
+msgid "First month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month_quarter
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month_semester
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month_quarter
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month_semester
 msgid "Force Month"
 msgstr "Forza mese"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_force_month_quarter
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_force_month_quarter
+msgid "Force the month to be used inside the quarter"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_force_month_semester
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_force_month_semester
+msgid "Force the month to be used inside the semester"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_type__forever
 msgid "Forever"
 msgstr "Per sempre"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__4
+msgid "Fourth month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__recurring_task
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__recurring_task
@@ -135,6 +167,11 @@ msgstr "Prodotto"
 msgid "Product Variant"
 msgstr "Variante prodotto"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_unit__quarter
+msgid "Quarters"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_type__repeat
 msgid "Repeat"
@@ -151,11 +188,27 @@ msgstr "Ripeti ogni"
 msgid "Sales Order Line"
 msgstr "Riga ordine di vendita"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__2
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__2
+msgid "Second month"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_unit__semester
+msgid "Semesters"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month__9
 msgid "September"
 msgstr "Settembre"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__6
+msgid "Sixth month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_start_date_method
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_start_date_method
@@ -178,6 +231,12 @@ msgstr "Inizio del periodo successivo"
 msgid "Task Repeat Unit"
 msgstr "Unità ripetizione lavoro"
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__3
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__3
+msgid "Third month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_start_date_method
 #: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_start_date_method

diff --git a/sale_project_task_recurrency/i18n/sale_project_task_recurrency.pot b/sale_project_task_recurrency/i18n/sale_project_task_recurrency.pot
@@ -65,17 +65,49 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__5
+msgid "Fifth month"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__1
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__1
+msgid "First month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month_quarter
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_force_month_semester
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month_quarter
+#: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_force_month_semester
 msgid "Force Month"
 msgstr ""
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_force_month_quarter
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_force_month_quarter
+msgid "Force the month to be used inside the quarter"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_force_month_semester
+#: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_force_month_semester
+msgid "Force the month to be used inside the semester"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_type__forever
 msgid "Forever"
 msgstr ""
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__4
+msgid "Fourth month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__recurring_task
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__recurring_task
@@ -132,6 +164,11 @@ msgstr ""
 msgid "Product Variant"
 msgstr ""
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_unit__quarter
+msgid "Quarters"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_type__repeat
 msgid "Repeat"
@@ -148,11 +185,27 @@ msgstr ""
 msgid "Sales Order Line"
 msgstr ""
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__2
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__2
+msgid "Second month"
+msgstr ""
+
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_repeat_unit__semester
+msgid "Semesters"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month__9
 msgid "September"
 msgstr ""
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__6
+msgid "Sixth month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_product__task_start_date_method
 #: model:ir.model.fields,field_description:sale_project_task_recurrency.field_product_template__task_start_date_method
@@ -175,6 +228,12 @@ msgstr ""
 msgid "Task Repeat Unit"
 msgstr ""
 
+#. module: sale_project_task_recurrency
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_quarter__3
+#: model:ir.model.fields.selection,name:sale_project_task_recurrency.selection__product_template__task_force_month_semester__3
+msgid "Third month"
+msgstr ""
+
 #. module: sale_project_task_recurrency
 #: model:ir.model.fields,help:sale_project_task_recurrency.field_product_product__task_start_date_method
 #: model:ir.model.fields,help:sale_project_task_recurrency.field_product_template__task_start_date_method

diff --git a/sale_project_task_recurrency/models/product_template.py b/sale_project_task_recurrency/models/product_template.py
@@ -13,6 +13,8 @@ class ProductTemplate(models.Model):
             ("day", "Days"),
             ("week", "Weeks"),
             ("month", "Months"),
+            ("quarter", "Quarters"),
+            ("semester", "Semesters"),
             ("year", "Years"),
         ],
         default="week",
@@ -73,6 +75,27 @@ class ProductTemplate(models.Model):
         ],
         "Force Month",
     )
+    task_force_month_quarter = fields.Selection(
+        [
+            ("1", "First month"),
+            ("2", "Second month"),
+            ("3", "Third month"),
+        ],
+        "Force Month",
+        help="Force the month to be used inside the quarter",
+    )
+    task_force_month_semester = fields.Selection(
+        [
+            ("1", "First month"),
+            ("2", "Second month"),
+            ("3", "Third month"),
+            ("4", "Fourth month"),
+            ("5", "Fifth month"),
+            ("6", "Sixth month"),
+        ],
+        "Force Month",
+        help="Force the month to be used inside the semester",
+    )
 
     @api.onchange("service_tracking")
     def _onchange_service_tracking(self):