From ceba22731c354ee9839fec993d6b84f0261446af Mon Sep 17 00:00:00 2001 From: Benoit Aimont Date: Tue, 10 Nov 2020 08:33:03 +0100 Subject: [PATCH 01/16] [13.0][ADD] new module purchase_stock_analytic --- purchase_stock_analytic/README.rst | 62 ++++++++++++++++++ purchase_stock_analytic/__init__.py | 1 + purchase_stock_analytic/__manifest__.py | 13 ++++ purchase_stock_analytic/models/__init__.py | 1 + .../models/purchase_order_line.py | 20 ++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes purchase_stock_analytic/tests/__init__.py | 1 + .../tests/test_purchase_stock_analytic.py | 49 ++++++++++++++ 8 files changed, 147 insertions(+) create mode 100644 purchase_stock_analytic/README.rst create mode 100644 purchase_stock_analytic/__init__.py create mode 100644 purchase_stock_analytic/__manifest__.py create mode 100644 purchase_stock_analytic/models/__init__.py create mode 100644 purchase_stock_analytic/models/purchase_order_line.py create mode 100644 purchase_stock_analytic/static/description/icon.png create mode 100644 purchase_stock_analytic/tests/__init__.py create mode 100644 purchase_stock_analytic/tests/test_purchase_stock_analytic.py diff --git a/purchase_stock_analytic/README.rst b/purchase_stock_analytic/README.rst new file mode 100644 index 0000000000..263a2692b8 --- /dev/null +++ b/purchase_stock_analytic/README.rst @@ -0,0 +1,62 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +======================= +Purchase Stock Analytic +======================= + +Copies the analytic account of the purchase order item to the stock move + +Usage +===== + +To use this module, you need to: + +#. Create a purchase order +#. Set an analytic account and analytic tags on purchase order lines +#. Confirm purchase order +#. ... and you should have your analytic account and analytic tags on your stock moves + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/87/13.0 + +.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt +.. branch is "8.0" for example + +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 smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Benoit Aimont + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/purchase_stock_analytic/__init__.py b/purchase_stock_analytic/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/purchase_stock_analytic/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/purchase_stock_analytic/__manifest__.py b/purchase_stock_analytic/__manifest__.py new file mode 100644 index 0000000000..485f061d47 --- /dev/null +++ b/purchase_stock_analytic/__manifest__.py @@ -0,0 +1,13 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Purchase Stock Analytic", + "summary": """ + Copies the analytic account of the purchase order item to the stock move""", + "version": "13.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-analytic", + "depends": ["purchase", "stock_analytic"], +} diff --git a/purchase_stock_analytic/models/__init__.py b/purchase_stock_analytic/models/__init__.py new file mode 100644 index 0000000000..fa6c0e40fd --- /dev/null +++ b/purchase_stock_analytic/models/__init__.py @@ -0,0 +1 @@ +from . import purchase_order_line diff --git a/purchase_stock_analytic/models/purchase_order_line.py b/purchase_stock_analytic/models/purchase_order_line.py new file mode 100644 index 0000000000..d95db55170 --- /dev/null +++ b/purchase_stock_analytic/models/purchase_order_line.py @@ -0,0 +1,20 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models + + +class PurchaseOrderLine(models.Model): + + _inherit = "purchase.order.line" + + def _prepare_stock_moves(self, picking): + res = super(PurchaseOrderLine, self)._prepare_stock_moves(picking) + for line in res: + account_analytic = self.account_analytic_id + analytic_tags = self.analytic_tag_ids + if account_analytic: + line.update({"analytic_account_id": account_analytic.id}) + if analytic_tags: + line.update({"analytic_tag_ids": [(6, 0, analytic_tags.ids)]}) + return res diff --git a/purchase_stock_analytic/static/description/icon.png b/purchase_stock_analytic/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/purchase_stock_analytic/tests/__init__.py b/purchase_stock_analytic/tests/__init__.py new file mode 100644 index 0000000000..76a2c027dd --- /dev/null +++ b/purchase_stock_analytic/tests/__init__.py @@ -0,0 +1 @@ +from . import test_purchase_stock_analytic diff --git a/purchase_stock_analytic/tests/test_purchase_stock_analytic.py b/purchase_stock_analytic/tests/test_purchase_stock_analytic.py new file mode 100644 index 0000000000..3b09a55b9b --- /dev/null +++ b/purchase_stock_analytic/tests/test_purchase_stock_analytic.py @@ -0,0 +1,49 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields +from odoo.tests.common import TransactionCase + + +class TestPurchaseStockAnalytic(TransactionCase): + def setUp(self): + super(TestPurchaseStockAnalytic, self).setUp() + self.purchase_order_model = self.env["purchase.order"] + self.purchase_order_line_model = self.env["purchase.order.line"] + self.analytic_tag_model = self.env["account.analytic.tag"] + self.product_model = self.env["product.product"] + self.res_partner_model = self.env["res.partner"] + + self.analytic_tag_1 = self.analytic_tag_model.create({"name": "Tag test 1"}) + self.analytic_tag_2 = self.analytic_tag_model.create({"name": "Tag test 2"}) + self.partner = self.res_partner_model.create({"name": "Partner test"}) + self.product = self.product_model.create({"name": "Product test"}) + self.analytic_account = self.env.ref("analytic.analytic_agrolait") + + self.purchase_order = self.purchase_order_model.create( + {"partner_id": self.partner.id} + ) + self.purchase_order_line = self.purchase_order_line_model.create( + { + "name": "purchase order line test", + "product_qty": 3, + "order_id": self.purchase_order.id, + "price_unit": 20, + "product_id": self.product.id, + "account_analytic_id": self.analytic_account.id, + "analytic_tag_ids": [ + (6, 0, [self.analytic_tag_1.id, self.analytic_tag_2.id]) + ], + "date_planned": fields.Datetime.today(), + "product_uom": self.product.uom_po_id.id, + } + ) + + def test_purchase_stock_analytic(self): + self.purchase_order.button_confirm() + self.move = self.purchase_order.picking_ids.move_ids_without_package + self.assertEqual(self.move.analytic_account_id, self.analytic_account) + self.assertEqual( + self.move.analytic_tag_ids.ids, + [self.analytic_tag_1.id, self.analytic_tag_2.id], + ) From 31b0cd6865eb19066d50ac0155f6643cafa99ed2 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 2 Nov 2021 10:39:15 +0100 Subject: [PATCH 02/16] [14.0][MIG] purchase_stock_analytic --- purchase_stock_analytic/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_stock_analytic/__manifest__.py b/purchase_stock_analytic/__manifest__.py index 485f061d47..43d5f66e86 100644 --- a/purchase_stock_analytic/__manifest__.py +++ b/purchase_stock_analytic/__manifest__.py @@ -5,7 +5,7 @@ "name": "Purchase Stock Analytic", "summary": """ Copies the analytic account of the purchase order item to the stock move""", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-analytic", From 05289f9ce0fd7debd6fc6fea944ccb44c39c6c28 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 2 Nov 2021 10:39:45 +0100 Subject: [PATCH 03/16] [IMP] purchase_stock_analytic: Depends on purchase_stock --- purchase_stock_analytic/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_stock_analytic/__manifest__.py b/purchase_stock_analytic/__manifest__.py index 43d5f66e86..6b603ca346 100644 --- a/purchase_stock_analytic/__manifest__.py +++ b/purchase_stock_analytic/__manifest__.py @@ -9,5 +9,5 @@ "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-analytic", - "depends": ["purchase", "stock_analytic"], + "depends": ["purchase_stock", "stock_analytic"], } From 6241dfd2bd459210d0f2acc359db52778027f870 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 2 Nov 2021 10:46:52 +0100 Subject: [PATCH 04/16] [IMP] purchase_stock_analytic: Improve tests --- .../tests/test_purchase_stock_analytic.py | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/purchase_stock_analytic/tests/test_purchase_stock_analytic.py b/purchase_stock_analytic/tests/test_purchase_stock_analytic.py index 3b09a55b9b..6cb3707410 100644 --- a/purchase_stock_analytic/tests/test_purchase_stock_analytic.py +++ b/purchase_stock_analytic/tests/test_purchase_stock_analytic.py @@ -2,40 +2,42 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import fields -from odoo.tests.common import TransactionCase +from odoo.tests.common import SavepointCase -class TestPurchaseStockAnalytic(TransactionCase): - def setUp(self): - super(TestPurchaseStockAnalytic, self).setUp() - self.purchase_order_model = self.env["purchase.order"] - self.purchase_order_line_model = self.env["purchase.order.line"] - self.analytic_tag_model = self.env["account.analytic.tag"] - self.product_model = self.env["product.product"] - self.res_partner_model = self.env["res.partner"] +class TestPurchaseStockAnalytic(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + cls.purchase_order_model = cls.env["purchase.order"] + cls.purchase_order_line_model = cls.env["purchase.order.line"] + cls.analytic_tag_model = cls.env["account.analytic.tag"] + cls.product_model = cls.env["product.product"] + cls.res_partner_model = cls.env["res.partner"] - self.analytic_tag_1 = self.analytic_tag_model.create({"name": "Tag test 1"}) - self.analytic_tag_2 = self.analytic_tag_model.create({"name": "Tag test 2"}) - self.partner = self.res_partner_model.create({"name": "Partner test"}) - self.product = self.product_model.create({"name": "Product test"}) - self.analytic_account = self.env.ref("analytic.analytic_agrolait") + cls.analytic_tag_1 = cls.analytic_tag_model.create({"name": "Tag test 1"}) + cls.analytic_tag_2 = cls.analytic_tag_model.create({"name": "Tag test 2"}) + cls.partner = cls.res_partner_model.create({"name": "Partner test"}) + cls.product = cls.product_model.create({"name": "Product test"}) + cls.analytic_account = cls.env.ref("analytic.analytic_agrolait") - self.purchase_order = self.purchase_order_model.create( - {"partner_id": self.partner.id} + cls.purchase_order = cls.purchase_order_model.create( + {"partner_id": cls.partner.id} ) - self.purchase_order_line = self.purchase_order_line_model.create( + cls.purchase_order_line = cls.purchase_order_line_model.create( { "name": "purchase order line test", "product_qty": 3, - "order_id": self.purchase_order.id, + "order_id": cls.purchase_order.id, "price_unit": 20, - "product_id": self.product.id, - "account_analytic_id": self.analytic_account.id, + "product_id": cls.product.id, + "account_analytic_id": cls.analytic_account.id, "analytic_tag_ids": [ - (6, 0, [self.analytic_tag_1.id, self.analytic_tag_2.id]) + (6, 0, [cls.analytic_tag_1.id, cls.analytic_tag_2.id]) ], "date_planned": fields.Datetime.today(), - "product_uom": self.product.uom_po_id.id, + "product_uom": cls.product.uom_po_id.id, } ) From 7a4827479f28588ec78ab86e1ada6b7066d5f085 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 8 Feb 2022 10:52:12 +0000 Subject: [PATCH 05/16] [UPD] Update purchase_stock_analytic.pot --- .../i18n/purchase_stock_analytic.pot | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 purchase_stock_analytic/i18n/purchase_stock_analytic.pot diff --git a/purchase_stock_analytic/i18n/purchase_stock_analytic.pot b/purchase_stock_analytic/i18n/purchase_stock_analytic.pot new file mode 100644 index 0000000000..dd4013e3f4 --- /dev/null +++ b/purchase_stock_analytic/i18n/purchase_stock_analytic.pot @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_stock_analytic +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: purchase_stock_analytic +#: model:ir.model.fields,field_description:purchase_stock_analytic.field_purchase_order_line__display_name +msgid "Display Name" +msgstr "" + +#. module: purchase_stock_analytic +#: model:ir.model.fields,field_description:purchase_stock_analytic.field_purchase_order_line__id +msgid "ID" +msgstr "" + +#. module: purchase_stock_analytic +#: model:ir.model.fields,field_description:purchase_stock_analytic.field_purchase_order_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: purchase_stock_analytic +#: model:ir.model,name:purchase_stock_analytic.model_purchase_order_line +msgid "Purchase Order Line" +msgstr "" From d845f563958672a9bd123e7f80689def2f7fe37f Mon Sep 17 00:00:00 2001 From: Ruchir Shukla Date: Thu, 29 Dec 2022 16:27:55 +0530 Subject: [PATCH 06/16] [IMP]purchase_stock_analytic: black, isort, prettier --- purchase_stock_analytic/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_stock_analytic/__manifest__.py b/purchase_stock_analytic/__manifest__.py index 6b603ca346..619a209756 100644 --- a/purchase_stock_analytic/__manifest__.py +++ b/purchase_stock_analytic/__manifest__.py @@ -5,7 +5,7 @@ "name": "Purchase Stock Analytic", "summary": """ Copies the analytic account of the purchase order item to the stock move""", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-analytic", From b2def0ab67329c3e35443fa2b70f7f909df60b40 Mon Sep 17 00:00:00 2001 From: Aungkokolin1997 Date: Wed, 22 Feb 2023 11:23:44 +0630 Subject: [PATCH 07/16] [MIG] purchase_stock_analytic: Migration to 16.0 --- purchase_stock_analytic/README.rst | 76 ++-- purchase_stock_analytic/__manifest__.py | 4 +- .../models/purchase_order_line.py | 9 +- .../readme/DESCRIPTION.rst | 1 + purchase_stock_analytic/readme/USAGE.rst | 6 + .../static/description/index.html | 423 ++++++++++++++++++ .../tests/test_purchase_stock_analytic.py | 22 +- 7 files changed, 488 insertions(+), 53 deletions(-) create mode 100644 purchase_stock_analytic/readme/DESCRIPTION.rst create mode 100644 purchase_stock_analytic/readme/USAGE.rst create mode 100644 purchase_stock_analytic/static/description/index.html diff --git a/purchase_stock_analytic/README.rst b/purchase_stock_analytic/README.rst index 263a2692b8..9d54f053ab 100644 --- a/purchase_stock_analytic/README.rst +++ b/purchase_stock_analytic/README.rst @@ -1,12 +1,36 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ======================= Purchase Stock Analytic ======================= -Copies the analytic account of the purchase order item to the stock move +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |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-OCA%2Faccount--analytic-lightgray.png?logo=github + :target: https://github.com/OCA/account-analytic/tree/16.0/purchase_stock_analytic + :alt: OCA/account-analytic +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-analytic-16-0/account-analytic-16-0-purchase_stock_analytic + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/87/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module copies the analytic distribution of the purchase order item to the stock move. + +**Table of contents** + +.. contents:: + :local: Usage ===== @@ -14,49 +38,41 @@ Usage To use this module, you need to: #. Create a purchase order -#. Set an analytic account and analytic tags on purchase order lines +#. Set analytic distribution on purchase order lines #. Confirm purchase order -#. ... and you should have your analytic account and analytic tags on your stock moves - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/87/13.0 - -.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt -.. branch is "8.0" for example +#. ... and you should have your analytic distribution on your stock moves 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 smash it by providing detailed and welcomed feedback. +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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* ACSONE SA/NV -Contributors ------------- +Maintainers +~~~~~~~~~~~ -* Benoit Aimont - -Maintainer ----------- +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/account-analytic `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_stock_analytic/__manifest__.py b/purchase_stock_analytic/__manifest__.py index 619a209756..f13e8beabb 100644 --- a/purchase_stock_analytic/__manifest__.py +++ b/purchase_stock_analytic/__manifest__.py @@ -4,8 +4,8 @@ { "name": "Purchase Stock Analytic", "summary": """ - Copies the analytic account of the purchase order item to the stock move""", - "version": "15.0.1.0.0", + Copies the analytic distribution of the purchase order item to the stock move""", + "version": "16.0.1.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-analytic", diff --git a/purchase_stock_analytic/models/purchase_order_line.py b/purchase_stock_analytic/models/purchase_order_line.py index d95db55170..579dce3d4a 100644 --- a/purchase_stock_analytic/models/purchase_order_line.py +++ b/purchase_stock_analytic/models/purchase_order_line.py @@ -10,11 +10,8 @@ class PurchaseOrderLine(models.Model): def _prepare_stock_moves(self, picking): res = super(PurchaseOrderLine, self)._prepare_stock_moves(picking) + if not self.analytic_distribution: + return res for line in res: - account_analytic = self.account_analytic_id - analytic_tags = self.analytic_tag_ids - if account_analytic: - line.update({"analytic_account_id": account_analytic.id}) - if analytic_tags: - line.update({"analytic_tag_ids": [(6, 0, analytic_tags.ids)]}) + line.update({"analytic_distribution": self.analytic_distribution}) return res diff --git a/purchase_stock_analytic/readme/DESCRIPTION.rst b/purchase_stock_analytic/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..20ac4a922d --- /dev/null +++ b/purchase_stock_analytic/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module copies the analytic distribution of the purchase order item to the stock move. diff --git a/purchase_stock_analytic/readme/USAGE.rst b/purchase_stock_analytic/readme/USAGE.rst new file mode 100644 index 0000000000..90abd123d8 --- /dev/null +++ b/purchase_stock_analytic/readme/USAGE.rst @@ -0,0 +1,6 @@ +To use this module, you need to: + +#. Create a purchase order +#. Set analytic distribution on purchase order lines +#. Confirm purchase order +#. ... and you should have your analytic distribution on your stock moves diff --git a/purchase_stock_analytic/static/description/index.html b/purchase_stock_analytic/static/description/index.html new file mode 100644 index 0000000000..8970b0bac7 --- /dev/null +++ b/purchase_stock_analytic/static/description/index.html @@ -0,0 +1,423 @@ + + + + + + +Purchase Stock Analytic + + + +
+

Purchase Stock Analytic

+ + +

Beta License: AGPL-3 OCA/account-analytic Translate me on Weblate Try me on Runbot

+

This module copies the analytic distribution of the purchase order item to the stock move.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Create a purchase order
    2. +
  2. Set analytic distribution on purchase order lines
    3. +
  3. Confirm purchase order
    4. +
  4. … and you should have your analytic distribution on your stock moves
    5. +
+
+
+

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 smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • ACSONE SA/NV
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/account-analytic project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/purchase_stock_analytic/tests/test_purchase_stock_analytic.py b/purchase_stock_analytic/tests/test_purchase_stock_analytic.py index 6cb3707410..f49831fa64 100644 --- a/purchase_stock_analytic/tests/test_purchase_stock_analytic.py +++ b/purchase_stock_analytic/tests/test_purchase_stock_analytic.py @@ -2,25 +2,24 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import fields -from odoo.tests.common import SavepointCase +from odoo.tests.common import TransactionCase -class TestPurchaseStockAnalytic(SavepointCase): +class TestPurchaseStockAnalytic(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) cls.purchase_order_model = cls.env["purchase.order"] cls.purchase_order_line_model = cls.env["purchase.order.line"] - cls.analytic_tag_model = cls.env["account.analytic.tag"] cls.product_model = cls.env["product.product"] cls.res_partner_model = cls.env["res.partner"] - cls.analytic_tag_1 = cls.analytic_tag_model.create({"name": "Tag test 1"}) - cls.analytic_tag_2 = cls.analytic_tag_model.create({"name": "Tag test 2"}) + cls.analytic_distribution = dict( + {str(cls.env.ref("analytic.analytic_agrolait").id): 100.0} + ) cls.partner = cls.res_partner_model.create({"name": "Partner test"}) cls.product = cls.product_model.create({"name": "Product test"}) - cls.analytic_account = cls.env.ref("analytic.analytic_agrolait") cls.purchase_order = cls.purchase_order_model.create( {"partner_id": cls.partner.id} @@ -32,10 +31,7 @@ def setUpClass(cls): "order_id": cls.purchase_order.id, "price_unit": 20, "product_id": cls.product.id, - "account_analytic_id": cls.analytic_account.id, - "analytic_tag_ids": [ - (6, 0, [cls.analytic_tag_1.id, cls.analytic_tag_2.id]) - ], + "analytic_distribution": cls.analytic_distribution, "date_planned": fields.Datetime.today(), "product_uom": cls.product.uom_po_id.id, } @@ -44,8 +40,4 @@ def setUpClass(cls): def test_purchase_stock_analytic(self): self.purchase_order.button_confirm() self.move = self.purchase_order.picking_ids.move_ids_without_package - self.assertEqual(self.move.analytic_account_id, self.analytic_account) - self.assertEqual( - self.move.analytic_tag_ids.ids, - [self.analytic_tag_1.id, self.analytic_tag_2.id], - ) + self.assertEqual(self.move.analytic_distribution, self.analytic_distribution) From 6435cf161031b050bed6e95be38a36a7ccc4a09c Mon Sep 17 00:00:00 2001 From: oca-ci Date: Wed, 12 Jul 2023 08:28:05 +0000 Subject: [PATCH 08/16] [UPD] Update purchase_stock_analytic.pot --- .../i18n/purchase_stock_analytic.pot | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/purchase_stock_analytic/i18n/purchase_stock_analytic.pot b/purchase_stock_analytic/i18n/purchase_stock_analytic.pot index dd4013e3f4..79aefa7440 100644 --- a/purchase_stock_analytic/i18n/purchase_stock_analytic.pot +++ b/purchase_stock_analytic/i18n/purchase_stock_analytic.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -13,21 +13,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: purchase_stock_analytic -#: model:ir.model.fields,field_description:purchase_stock_analytic.field_purchase_order_line__display_name -msgid "Display Name" -msgstr "" - -#. module: purchase_stock_analytic -#: model:ir.model.fields,field_description:purchase_stock_analytic.field_purchase_order_line__id -msgid "ID" -msgstr "" - -#. module: purchase_stock_analytic -#: model:ir.model.fields,field_description:purchase_stock_analytic.field_purchase_order_line____last_update -msgid "Last Modified on" -msgstr "" - #. module: purchase_stock_analytic #: model:ir.model,name:purchase_stock_analytic.model_purchase_order_line msgid "Purchase Order Line" From 055bb2a15a25ab7cb33d99df4c3de0170c1d1f5d Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 12 Jul 2023 08:45:51 +0000 Subject: [PATCH 09/16] [UPD] README.rst --- purchase_stock_analytic/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_stock_analytic/static/description/index.html b/purchase_stock_analytic/static/description/index.html index 8970b0bac7..d7d5fca347 100644 --- a/purchase_stock_analytic/static/description/index.html +++ b/purchase_stock_analytic/static/description/index.html @@ -3,7 +3,7 @@ - + Purchase Stock Analytic