diff --git a/mrp_stock_orderpoint_manual_procurement/README.rst b/mrp_stock_orderpoint_manual_procurement/README.rst index e8e757198..afd5839d4 100644 --- a/mrp_stock_orderpoint_manual_procurement/README.rst +++ b/mrp_stock_orderpoint_manual_procurement/README.rst @@ -14,13 +14,13 @@ MRP Stock Orderpoint Manual Procurement :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github - :target: https://github.com/OCA/manufacture/tree/12.0/mrp_stock_orderpoint_manual_procurement + :target: https://github.com/OCA/manufacture/tree/13.0/mrp_stock_orderpoint_manual_procurement :alt: OCA/manufacture .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/manufacture-12-0/manufacture-12-0-mrp_stock_orderpoint_manual_procurement + :target: https://translation.odoo-community.org/projects/manufacture-13-0/manufacture-13-0-mrp_stock_orderpoint_manual_procurement :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/129/12.0 + :target: https://runbot.odoo-community.org/runbot/129/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -46,7 +46,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 smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -56,13 +56,14 @@ Credits Authors ~~~~~~~ -* Eficent +* Forgeflow Contributors ~~~~~~~~~~~~ -* Adria Gil Sorribes -* Lois Rilo Antelo +* Adria Gil Sorribes +* Lois Rilo Antelo +* Pimolnat Suntian Maintainers ~~~~~~~~~~~ @@ -77,6 +78,6 @@ 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/manufacture `_ project on GitHub. +This module is part of the `OCA/manufacture `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mrp_stock_orderpoint_manual_procurement/__manifest__.py b/mrp_stock_orderpoint_manual_procurement/__manifest__.py index 915bd8cb6..2b25f53e3 100644 --- a/mrp_stock_orderpoint_manual_procurement/__manifest__.py +++ b/mrp_stock_orderpoint_manual_procurement/__manifest__.py @@ -1,12 +1,11 @@ -# Copyright 2018 Eficent Business and IT Consulting Services S.L. -# (http://www.eficent.com) +# Copyright 2018-20 ForgeFlow S.L. (https://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "MRP Stock Orderpoint Manual Procurement", "summary": "Updates the value of MO Responsible and keeps track" "of changes regarding this field", "version": "13.0.1.0.0", - "author": "Eficent, " "Odoo Community Association (OCA)", + "author": "Forgeflow, Odoo Community Association (OCA)", "website": "https://github.com/OCA/manufacture", "category": "Manufacturing", "depends": ["mrp", "stock_orderpoint_manual_procurement"], diff --git a/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py b/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py index f2625c4ca..7904da876 100644 --- a/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py +++ b/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py @@ -1,4 +1,4 @@ -# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# Copyright 2019-20 ForgeFlow S.L. (https://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import fields, models diff --git a/mrp_stock_orderpoint_manual_procurement/models/stock_rule.py b/mrp_stock_orderpoint_manual_procurement/models/stock_rule.py index 2ac431a3f..6ffc8657a 100644 --- a/mrp_stock_orderpoint_manual_procurement/models/stock_rule.py +++ b/mrp_stock_orderpoint_manual_procurement/models/stock_rule.py @@ -1,4 +1,4 @@ -# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# Copyright 2019-20 ForgeFlow S.L. (https://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import models @@ -15,11 +15,20 @@ class StockRule(models.Model): location_id, name, origin, + company_id, values, bom, ): res = super(StockRule, self)._prepare_mo_vals( - product_id, product_qty, product_uom, location_id, name, origin, values, bom + product_id, + product_qty, + product_uom, + location_id, + name, + origin, + company_id, + values, + bom, ) requested_uid = self.env.context.get("requested_uid") if requested_uid: diff --git a/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst b/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst index 76e4c541c..900752be9 100644 --- a/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst +++ b/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ -* Adria Gil Sorribes -* Lois Rilo Antelo +* Adria Gil Sorribes +* Lois Rilo Antelo +* Pimolnat Suntian diff --git a/mrp_stock_orderpoint_manual_procurement/static/description/index.html b/mrp_stock_orderpoint_manual_procurement/static/description/index.html index 5c099fbfc..3366536be 100644 --- a/mrp_stock_orderpoint_manual_procurement/static/description/index.html +++ b/mrp_stock_orderpoint_manual_procurement/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module updates a new field Requested by in Manufacturing Orders in the case the MO has been created as a result of a manual procurement from an orderpoint.

@@ -394,7 +394,7 @@ Your user will be set as Requeste by in the newly created MO.

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.

+feedback.

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

@@ -402,14 +402,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Authors

    -
  • Eficent
    • +
  • Forgeflow

Contributors

@@ -419,7 +420,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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/manufacture project on GitHub.

+

This module is part of the OCA/manufacture project on GitHub.

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

diff --git a/mrp_stock_orderpoint_manual_procurement/tests/test_mrp_manual_procurement.py b/mrp_stock_orderpoint_manual_procurement/tests/test_mrp_manual_procurement.py index 106abd222..18925b4d6 100644 --- a/mrp_stock_orderpoint_manual_procurement/tests/test_mrp_manual_procurement.py +++ b/mrp_stock_orderpoint_manual_procurement/tests/test_mrp_manual_procurement.py @@ -1,4 +1,4 @@ -# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# Copyright 2019-20 ForgeFlow S.L. (https://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo.tests.common import TransactionCase @@ -46,7 +46,6 @@ class TestMrpManualProcurement(TransactionCase): "picking_type_id": self.env.ref( "stock.picking_type_internal" ).id, - "propagate": True, }, ) ], @@ -105,7 +104,9 @@ class TestMrpManualProcurement(TransactionCase): "active_ids": orderpoint.ids, "active_id": orderpoint.id, } - wizard = self.manual_procurement_wiz.sudo(user).with_context(context).create({}) + wizard = ( + self.manual_procurement_wiz.with_user(user).with_context(context).create({}) + ) wizard.make_procurement() return wizard diff --git a/mrp_stock_orderpoint_manual_procurement/views/mrp_production_view.xml b/mrp_stock_orderpoint_manual_procurement/views/mrp_production_view.xml index 2371d2297..b43c5d2de 100644 --- a/mrp_stock_orderpoint_manual_procurement/views/mrp_production_view.xml +++ b/mrp_stock_orderpoint_manual_procurement/views/mrp_production_view.xml @@ -1,17 +1,17 @@ - - - - mrp.production.form - mrp_stock_orderpoint_manual_procurement + mrp.production.form - mrp_stock_orderpoint_manual_procurement mrp.production - + - - + + - diff --git a/setup/mrp_stock_orderpoint_manual_procurement/odoo/addons/mrp_stock_orderpoint_manual_procurement b/setup/mrp_stock_orderpoint_manual_procurement/odoo/addons/mrp_stock_orderpoint_manual_procurement new file mode 120000 index 000000000..5bdb38682 --- /dev/null +++ b/setup/mrp_stock_orderpoint_manual_procurement/odoo/addons/mrp_stock_orderpoint_manual_procurement @@ -0,0 +1 @@ +../../../../mrp_stock_orderpoint_manual_procurement \ No newline at end of file diff --git a/setup/mrp_stock_orderpoint_manual_procurement/setup.py b/setup/mrp_stock_orderpoint_manual_procurement/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/mrp_stock_orderpoint_manual_procurement/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)