diff --git a/budget_activity_purchase_request/README.rst b/budget_activity_purchase_request/README.rst index ee894a2f..0cbe3755 100644 --- a/budget_activity_purchase_request/README.rst +++ b/budget_activity_purchase_request/README.rst @@ -17,7 +17,7 @@ Budget Activity - Purchase Request :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-ecosoft--odoo%2Fbudgeting-lightgray.png?logo=github - :target: https://github.com/ecosoft-odoo/budgeting/tree/15.0/budget_activity_purchase_request + :target: https://github.com/ecosoft-odoo/budgeting/tree/16.0/budget_activity_purchase_request :alt: ecosoft-odoo/budgeting |badge1| |badge2| |badge3| @@ -47,7 +47,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -79,6 +79,6 @@ Current maintainer: |maintainer-kittiu| -This module is part of the `ecosoft-odoo/budgeting `_ project on GitHub. +This module is part of the `ecosoft-odoo/budgeting `_ project on GitHub. You are welcome to contribute. diff --git a/budget_activity_purchase_request/__manifest__.py b/budget_activity_purchase_request/__manifest__.py index eb8a64a9..11a20a27 100644 --- a/budget_activity_purchase_request/__manifest__.py +++ b/budget_activity_purchase_request/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Budget Activity - Purchase Request", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "category": "Accounting", "license": "AGPL-3", "author": "Ecosoft, Odoo Community Association (OCA)", diff --git a/budget_activity_purchase_request/static/description/index.html b/budget_activity_purchase_request/static/description/index.html index 1598fefa..0a0f1a46 100644 --- a/budget_activity_purchase_request/static/description/index.html +++ b/budget_activity_purchase_request/static/description/index.html @@ -1,4 +1,3 @@ - @@ -9,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -369,7 +369,7 @@

Budget Activity - Purchase Request

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:77092d5bfc7602e66fc8e05a07133b841b6602c74921167091834511cc49d178 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Alpha License: AGPL-3 ecosoft-odoo/budgeting

+

Alpha License: AGPL-3 ecosoft-odoo/budgeting

This module add “Activity” element for purchase request budget commitment

Important

@@ -403,7 +403,7 @@

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.

+feedback.

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

@@ -432,7 +432,7 @@

Contributors

Maintainers

Current maintainer:

kittiu

-

This module is part of the ecosoft-odoo/budgeting project on GitHub.

+

This module is part of the ecosoft-odoo/budgeting project on GitHub.

You are welcome to contribute.

diff --git a/budget_activity_purchase_request/tests/test_budget_activity_purchase_request.py b/budget_activity_purchase_request/tests/test_budget_activity_purchase_request.py index 33ed5f5b..0736d410 100644 --- a/budget_activity_purchase_request/tests/test_budget_activity_purchase_request.py +++ b/budget_activity_purchase_request/tests/test_budget_activity_purchase_request.py @@ -30,7 +30,7 @@ def _create_purchase_request(self, pr_lines): line.product_id = pr_line["product_id"] line.product_qty = pr_line["product_qty"] line.estimated_cost = pr_line["estimated_cost"] - line.analytic_account_id = pr_line["analytic_id"] + line.analytic_distribution = pr_line["analytic_distribution"] line.activity_id = pr_line["activity_id"] purchase_request = pr.save() return purchase_request @@ -46,13 +46,14 @@ def test_01_budget_activity_purchase(self): self.budget_period.control_budget = True self.budget_control.action_done() + analytic_distribution = {str(self.costcenter1.id): 100} purchase_request = self._create_purchase_request( [ { "product_id": self.product1, # KPI1 = 30 "product_qty": 3, "estimated_cost": 30, - "analytic_id": self.costcenter1, + "analytic_distribution": analytic_distribution, "activity_id": self.activity3, }, ] diff --git a/budget_activity_purchase_request/views/purchase_request_line_view.xml b/budget_activity_purchase_request/views/purchase_request_line_view.xml index 1e2ad3ba..c3fa0b46 100644 --- a/budget_activity_purchase_request/views/purchase_request_line_view.xml +++ b/budget_activity_purchase_request/views/purchase_request_line_view.xml @@ -19,9 +19,11 @@ expr="//group[@name='settings']/field[@name='product_id']" position="after" > + diff --git a/budget_activity_purchase_request/views/purchase_request_view.xml b/budget_activity_purchase_request/views/purchase_request_view.xml index 7620b4b4..10da5381 100644 --- a/budget_activity_purchase_request/views/purchase_request_view.xml +++ b/budget_activity_purchase_request/views/purchase_request_view.xml @@ -9,9 +9,11 @@ expr="//field['line_ids']/tree/field[@name='product_id']" position="after" > + @@ -28,9 +30,11 @@ expr="//group[@name='main']//field[@name='product_id']" position="after" > +