Merge pull request #927 from OCA/15.0

Syncing from upstream OCA/project (15.0)

README.md

@@ -56,7 +56,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.1.0 |  | Apply Work Breakdown Structure
+[project_wbs](project_wbs/) | 15.0.1.1.1 |  | 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)

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:89c0fd245cfc9a6feea821d91d34ff4b6da5f9fabd2af14d0ace551ff2427671
+   !! source digest: sha256:2a066d67c820c06658fa237cf47213efcac82d054a59ef2f3b470376cf01a780
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

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.1.0",
+    "version": "15.0.1.1.1",
     "license": "AGPL-3",
     "author": "Matmoz d.o.o., "
     "Luxim d.o.o., "

project_wbs/models/account_analytic_account.py

@@ -106,7 +106,7 @@ def _wbs_indent_calc(self):
     @api.depends("account_class", "parent_id")
     def _compute_project_analytic_id(self):
         for analytic in self:
-            if analytic.parent_id:
+            if analytic.parent_id.filtered(lambda l: l.account_class == "project"):
                 current = analytic.parent_id
             else:
                 current = analytic

project_wbs/static/description/index.html

@@ -366,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:89c0fd245cfc9a6feea821d91d34ff4b6da5f9fabd2af14d0ace551ff2427671
+!! source digest: sha256:2a066d67c820c06658fa237cf47213efcac82d054a59ef2f3b470376cf01a780
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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>