Merge pull request #917 from OCA/15.0

Syncing from upstream OCA/project (15.0)
brain-tec · Jan 9, 2024 · bd18b36 · bd18b36
2 parents 46b277e + db2285f
commit bd18b36
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 82 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ addon | version | maintainers | summary
 [project_timeline_hr_timesheet](project_timeline_hr_timesheet/) | 15.0.1.0.0 |  | Shows the progress of tasks on the timeline view.
 [project_timesheet_time_control](project_timesheet_time_control/) | 15.0.1.1.1 | [![ernestotejeda](https://github.com/ernestotejeda.png?size=30px)](https://github.com/ernestotejeda) | Project timesheet time control
 [project_type](project_type/) | 15.0.1.0.1 |  | Project Types
-[project_wbs](project_wbs/) | 15.0.1.0.0 |  | Apply Work Breakdown Structure
+[project_wbs](project_wbs/) | 15.0.1.1.0 |  | Apply Work Breakdown Structure
 [sale_project_copy_tasks](sale_project_copy_tasks/) | 15.0.1.0.1 | [![shide](https://github.com/shide.png?size=30px)](https://github.com/shide) [![EmilioPascual](https://github.com/EmilioPascual.png?size=30px)](https://github.com/EmilioPascual) | Copy tasks into sale order's project
 
 [//]: # (end addons)

diff --git a/project_wbs/README.rst b/project_wbs/README.rst
@@ -7,7 +7,7 @@ Project Work Breakdown Structure
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a44ba550b51336716d8c9c9c97a6ddcd17cc11e5de6c83f5577cf2d2b99e34fe
+   !! source digest: sha256:89c0fd245cfc9a6feea821d91d34ff4b6da5f9fabd2af14d0ace551ff2427671
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/project_wbs/__manifest__.py b/project_wbs/__manifest__.py
@@ -6,7 +6,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": "Project Work Breakdown Structure",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.1.0",
     "license": "AGPL-3",
     "author": "Matmoz d.o.o., "
     "Luxim d.o.o., "

diff --git a/project_wbs/i18n/de.po b/project_wbs/i18n/de.po
@@ -110,11 +110,6 @@ msgstr ""
 msgid "Edit project"
 msgstr ""
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "End Date"
-msgstr ""
-
 #. module: project_wbs
 #: model:ir.model.fields,field_description:project_wbs.field_account_analytic_account__complete_wbs_code
 msgid "Full WBS Code"
@@ -234,11 +229,6 @@ msgstr ""
 msgid "Root Analytic Account"
 msgstr ""
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "Start Date"
-msgstr ""
-
 #. module: project_wbs
 #: model:ir.model.fields,help:project_wbs.field_account_analytic_account__account_class
 #: model:ir.model.fields,help:project_wbs.field_project_project__account_class

diff --git a/project_wbs/i18n/es.po b/project_wbs/i18n/es.po
@@ -114,11 +114,6 @@ msgstr "Duplicar el proyecto en lugar de la cuenta analítica"
 msgid "Edit project"
 msgstr "Editar proyecto"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "End Date"
-msgstr "fecha final"
-
 #. module: project_wbs
 #: model:ir.model.fields,field_description:project_wbs.field_account_analytic_account__complete_wbs_code
 msgid "Full WBS Code"
@@ -243,11 +238,6 @@ msgstr "Referencia"
 msgid "Root Analytic Account"
 msgstr "Cuenta analítica raíz"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "Start Date"
-msgstr "fecha de inicio"
-
 #. module: project_wbs
 #: model:ir.model.fields,help:project_wbs.field_account_analytic_account__account_class
 #: model:ir.model.fields,help:project_wbs.field_project_project__account_class
@@ -356,3 +346,9 @@ msgid ""
 msgstr ""
 "Podrá colaborar con usuarios internos en\n"
 "                proyectos o invitar a clientes a compartir sus actividades."
+
+#~ msgid "End Date"
+#~ msgstr "fecha final"
+
+#~ msgid "Start Date"
+#~ msgstr "fecha de inicio"
diff --git a/project_wbs/i18n/fr.po b/project_wbs/i18n/fr.po
@@ -112,11 +112,6 @@ msgstr "Dupliquez le projet au lieu du compte analytique"
 msgid "Edit project"
 msgstr "Modifier le projet"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "End Date"
-msgstr "Date de fin"
-
 #. module: project_wbs
 #: model:ir.model.fields,field_description:project_wbs.field_account_analytic_account__complete_wbs_code
 msgid "Full WBS Code"
@@ -236,11 +231,6 @@ msgstr "Référence"
 msgid "Root Analytic Account"
 msgstr "Compte analytique racine"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "Start Date"
-msgstr "Date de début"
-
 #. module: project_wbs
 #: model:ir.model.fields,help:project_wbs.field_account_analytic_account__account_class
 #: model:ir.model.fields,help:project_wbs.field_project_project__account_class
@@ -348,6 +338,12 @@ msgid ""
 "                projects or invite customers to share your activities."
 msgstr ""
 
+#~ msgid "End Date"
+#~ msgstr "Date de fin"
+
+#~ msgid "Start Date"
+#~ msgstr "Date de début"
+
 #~ msgid ""
 #~ "Link this project to an analytic account if you need financial management "
 #~ "on projects. It enables you to connect projects with budgets, planning, "

diff --git a/project_wbs/i18n/it.po b/project_wbs/i18n/it.po
@@ -114,11 +114,6 @@ msgstr "Duplicare il progetto invece che il conto analitico"
 msgid "Edit project"
 msgstr "Modifica progetto"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "End Date"
-msgstr "Data fine"
-
 #. module: project_wbs
 #: model:ir.model.fields,field_description:project_wbs.field_account_analytic_account__complete_wbs_code
 msgid "Full WBS Code"
@@ -243,11 +238,6 @@ msgstr "Riferimento"
 msgid "Root Analytic Account"
 msgstr "Conto analitico radice"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "Start Date"
-msgstr "Data inizio"
-
 #. module: project_wbs
 #: model:ir.model.fields,help:project_wbs.field_account_analytic_account__account_class
 #: model:ir.model.fields,help:project_wbs.field_project_project__account_class
@@ -356,3 +346,9 @@ msgid ""
 msgstr ""
 "Sarà possibile collaborare con utenti interni nei\n"
 "                progetti o invitare clienti a condividere le attività."
+
+#~ msgid "End Date"
+#~ msgstr "Data fine"
+
+#~ msgid "Start Date"
+#~ msgstr "Data inizio"
diff --git a/project_wbs/i18n/project_wbs.pot b/project_wbs/i18n/project_wbs.pot
@@ -107,11 +107,6 @@ msgstr ""
 msgid "Edit project"
 msgstr ""
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "End Date"
-msgstr ""
-
 #. module: project_wbs
 #: model:ir.model.fields,field_description:project_wbs.field_account_analytic_account__complete_wbs_code
 msgid "Full WBS Code"
@@ -231,11 +226,6 @@ msgstr ""
 msgid "Root Analytic Account"
 msgstr ""
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "Start Date"
-msgstr ""
-
 #. module: project_wbs
 #: model:ir.model.fields,help:project_wbs.field_account_analytic_account__account_class
 #: model:ir.model.fields,help:project_wbs.field_project_project__account_class

diff --git a/project_wbs/i18n/pt_BR.po b/project_wbs/i18n/pt_BR.po
@@ -108,11 +108,6 @@ msgstr ""
 msgid "Edit project"
 msgstr ""
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "End Date"
-msgstr ""
-
 #. module: project_wbs
 #: model:ir.model.fields,field_description:project_wbs.field_account_analytic_account__complete_wbs_code
 msgid "Full WBS Code"
@@ -232,11 +227,6 @@ msgstr ""
 msgid "Root Analytic Account"
 msgstr ""
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "Start Date"
-msgstr ""
-
 #. module: project_wbs
 #: model:ir.model.fields,help:project_wbs.field_account_analytic_account__account_class
 #: model:ir.model.fields,help:project_wbs.field_project_project__account_class

diff --git a/project_wbs/i18n/sl.po b/project_wbs/i18n/sl.po
@@ -111,11 +111,6 @@ msgstr "Podvojite projekt namesto analitičnega konta"
 msgid "Edit project"
 msgstr "Uredi projekt"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "End Date"
-msgstr "Končni datum"
-
 #. module: project_wbs
 #: model:ir.model.fields,field_description:project_wbs.field_account_analytic_account__complete_wbs_code
 msgid "Full WBS Code"
@@ -235,11 +230,6 @@ msgstr "Sklic"
 msgid "Root Analytic Account"
 msgstr "Temeljni konto"
 
-#. module: project_wbs
-#: model_terms:ir.ui.view,arch_db:project_wbs.view_project
-msgid "Start Date"
-msgstr "Začetni datum"
-
 #. module: project_wbs
 #: model:ir.model.fields,help:project_wbs.field_account_analytic_account__account_class
 #: model:ir.model.fields,help:project_wbs.field_project_project__account_class
@@ -345,6 +335,12 @@ msgid ""
 "                projects or invite customers to share your activities."
 msgstr ""
 
+#~ msgid "End Date"
+#~ msgstr "Končni datum"
+
+#~ msgid "Start Date"
+#~ msgstr "Začetni datum"
+
 #~ msgid ""
 #~ "Link this project to an analytic account if you need financial management "
 #~ "on projects. It enables you to connect projects with budgets, planning, "

diff --git a/project_wbs/models/project_project.py b/project_wbs/models/project_project.py
@@ -191,21 +191,18 @@ def update_project_from_analytic_vals(self, vals):
     )
     wbs_indent = fields.Char(
         related="analytic_account_id.wbs_indent",
-        readonly=False,
     )
     complete_wbs_code = fields.Char(
         related="analytic_account_id.complete_wbs_code",
         string="WBS Code",
         store=True,
-        readonly=False,
     )
     code = fields.Char(
         related="analytic_account_id.code",
         readonly=False,
     )
     complete_wbs_name = fields.Char(
         related="analytic_account_id.complete_wbs_name",
-        readonly=False,
     )
     project_analytic_id = fields.Many2one(
         related="analytic_account_id.project_analytic_id", readonly=True, store=True

diff --git a/project_wbs/static/description/index.html b/project_wbs/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Project Work Breakdown Structure</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a44ba550b51336716d8c9c9c97a6ddcd17cc11e5de6c83f5577cf2d2b99e34fe
+!! source digest: sha256:89c0fd245cfc9a6feea821d91d34ff4b6da5f9fabd2af14d0ace551ff2427671
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/project/tree/15.0/project_wbs"><img alt="OCA/project" src="https://img.shields.io/badge/github-OCA%2Fproject-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/project-15-0/project-15-0-project_wbs"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/project&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Adding WBS information to Odoo Projects</p>

diff --git a/project_wbs/view/project_project_view.xml b/project_wbs/view/project_project_view.xml
@@ -109,10 +109,6 @@
                 <field name="account_class" string="Class" />
                 <field name="child_ids" invisible="True" />
             </field>
-            <field name="user_id" position="after">
-                <field name="date_start" string="Start Date" />
-                <field name="date" string="End Date" />
-            </field>
         </field>
     </record>