From db5c0ff26fed393a31be113c0df1785637d29bfd Mon Sep 17 00:00:00 2001 From: mreficent Date: Mon, 15 Jul 2019 16:59:19 +0200 Subject: [PATCH] [MIG] mrp_stock_orderpoint_manual_procurement: Migration to 12.0 --- mrp_stock_orderpoint_manual_procurement/README.rst | 12 ++++++------ mrp_stock_orderpoint_manual_procurement/__init__.py | 2 +- .../__manifest__.py | 4 ++-- .../models/__init__.py | 4 ++-- .../models/mrp_production.py | 2 +- .../models/{procurement.py => stock_rule.py} | 8 ++++---- .../readme/USAGE.rst | 2 +- .../static/description/index.html | 8 ++++---- .../tests/__init__.py | 2 ++ .../tests/test_mrp_manual_procurement.py | 10 +++++----- 10 files changed, 28 insertions(+), 26 deletions(-) rename mrp_stock_orderpoint_manual_procurement/models/{procurement.py => stock_rule.py} (71%) diff --git a/mrp_stock_orderpoint_manual_procurement/README.rst b/mrp_stock_orderpoint_manual_procurement/README.rst index 385ab99e9..e8e757198 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/11.0/mrp_stock_orderpoint_manual_procurement + :target: https://github.com/OCA/manufacture/tree/12.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-11-0/manufacture-11-0-mrp_stock_orderpoint_manual_procurement + :target: https://translation.odoo-community.org/projects/manufacture-12-0/manufacture-12-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/11.0 + :target: https://runbot.odoo-community.org/runbot/129/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -37,7 +37,7 @@ an orderpoint. Usage ===== -Go to an orderpoint an do a manual procurement for a manufactured product. +Go to an orderpoint and do a manual procurement for a manufactured product. Your user will be set as *Requeste by* in the newly created MO. Bug Tracker @@ -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. @@ -77,6 +77,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/__init__.py b/mrp_stock_orderpoint_manual_procurement/__init__.py index 4b76c7b2d..31660d6a9 100644 --- a/mrp_stock_orderpoint_manual_procurement/__init__.py +++ b/mrp_stock_orderpoint_manual_procurement/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import models diff --git a/mrp_stock_orderpoint_manual_procurement/__manifest__.py b/mrp_stock_orderpoint_manual_procurement/__manifest__.py index cd961da0a..94374bade 100644 --- a/mrp_stock_orderpoint_manual_procurement/__manifest__.py +++ b/mrp_stock_orderpoint_manual_procurement/__manifest__.py @@ -1,11 +1,11 @@ # Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# 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": "11.0.1.0.0", + "version": "12.0.1.0.0", "author": "Eficent, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/manufacture", diff --git a/mrp_stock_orderpoint_manual_procurement/models/__init__.py b/mrp_stock_orderpoint_manual_procurement/models/__init__.py index 2cafca2ee..4c76d6030 100644 --- a/mrp_stock_orderpoint_manual_procurement/models/__init__.py +++ b/mrp_stock_orderpoint_manual_procurement/models/__init__.py @@ -1,4 +1,4 @@ -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from . import procurement from . import mrp_production +from . import stock_rule diff --git a/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py b/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py index e4932a66d..b6380253f 100644 --- a/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py +++ b/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py @@ -1,5 +1,5 @@ # Copyright 2019 Eficent Business and IT Consulting Services S.L. -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# 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/procurement.py b/mrp_stock_orderpoint_manual_procurement/models/stock_rule.py similarity index 71% rename from mrp_stock_orderpoint_manual_procurement/models/procurement.py rename to mrp_stock_orderpoint_manual_procurement/models/stock_rule.py index 0379a4b42..9fc26b4c4 100644 --- a/mrp_stock_orderpoint_manual_procurement/models/procurement.py +++ b/mrp_stock_orderpoint_manual_procurement/models/stock_rule.py @@ -1,15 +1,15 @@ # Copyright 2019 Eficent Business and IT Consulting Services S.L. -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import models -class ProcurementRule(models.Model): - _inherit = 'procurement.rule' +class StockRule(models.Model): + _inherit = 'stock.rule' def _prepare_mo_vals(self, product_id, product_qty, product_uom, location_id, name, origin, values, bom): - res = super(ProcurementRule, self)._prepare_mo_vals( + res = super(StockRule, self)._prepare_mo_vals( product_id, product_qty, product_uom, location_id, name, origin, values, bom) requested_uid = self.env.context.get('requested_uid') diff --git a/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst b/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst index 7967b7304..4fb2af6a2 100644 --- a/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst +++ b/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst @@ -1,2 +1,2 @@ -Go to an orderpoint an do a manual procurement for a manufactured product. +Go to an orderpoint and do a manual procurement for a manufactured product. Your user will be set as *Requeste by* in the newly created MO. diff --git a/mrp_stock_orderpoint_manual_procurement/static/description/index.html b/mrp_stock_orderpoint_manual_procurement/static/description/index.html index 213e1435b..4a47e4328 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.

@@ -386,7 +386,7 @@ an orderpoint.

Usage

-

Go to an orderpoint an do a manual procurement for a manufactured product. +

Go to an orderpoint and do a manual procurement for a manufactured product. Your user will be set as Requeste by in the newly created MO.

@@ -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.

@@ -419,7 +419,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/__init__.py b/mrp_stock_orderpoint_manual_procurement/tests/__init__.py index 7f20332cc..bd140c66d 100644 --- a/mrp_stock_orderpoint_manual_procurement/tests/__init__.py +++ b/mrp_stock_orderpoint_manual_procurement/tests/__init__.py @@ -1 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + from . import test_mrp_manual_procurement 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 fec62474d..ac3f310d8 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,13 +1,13 @@ # Copyright 2019 Eficent Business and IT Consulting Services S.L. -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo.tests.common import TransactionCase class TestMrpManualProcurement(TransactionCase): - def setUp(self, *args, **kwargs): - super(TestMrpManualProcurement, self).setUp(*args, **kwargs) + def setUp(self): + super(TestMrpManualProcurement, self).setUp() self.production_model = self.env['mrp.production'] self.product_model = self.env['product.product'] @@ -31,9 +31,9 @@ class TestMrpManualProcurement(TransactionCase): test_route = self.route_model.create({ 'name': 'Stock -> Test', 'product_selectable': True, - 'pull_ids': [(0, 0, { + 'rule_ids': [(0, 0, { 'name': 'stock to test', - 'action': 'move', + 'action': 'pull', 'location_id': self.secondary_loc.id, 'location_src_id': self.stock_loc.id, 'procure_method': 'make_to_order',