From b1c61973e2b37bfa272aac93a5f04c47bdff8731 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Wed, 16 May 2018 01:47:07 +0200 Subject: [PATCH 01/16] add stock_orderpoint_move_link and stock_orderpoint_purchase_link --- stock_orderpoint_purchase_link/README.rst | 52 ++++++++++++++++++ stock_orderpoint_purchase_link/__init__.py | 2 + .../__manifest__.py | 22 ++++++++ .../models/__init__.py | 2 + .../models/procurement_rule.py | 31 +++++++++++ .../models/purchase_order_line.py | 12 ++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/purchase_order_views.xml | 35 ++++++++++++ 8 files changed, 156 insertions(+) create mode 100644 stock_orderpoint_purchase_link/README.rst create mode 100644 stock_orderpoint_purchase_link/__init__.py create mode 100644 stock_orderpoint_purchase_link/__manifest__.py create mode 100644 stock_orderpoint_purchase_link/models/__init__.py create mode 100644 stock_orderpoint_purchase_link/models/procurement_rule.py create mode 100644 stock_orderpoint_purchase_link/models/purchase_order_line.py create mode 100644 stock_orderpoint_purchase_link/static/description/icon.png create mode 100644 stock_orderpoint_purchase_link/views/purchase_order_views.xml diff --git a/stock_orderpoint_purchase_link/README.rst b/stock_orderpoint_purchase_link/README.rst new file mode 100644 index 000000000..42fbcfef2 --- /dev/null +++ b/stock_orderpoint_purchase_link/README.rst @@ -0,0 +1,52 @@ +.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg + :target: https://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 + +============================== +Stock Orderpoint Purchase Link +============================== + +This module adds to purchase order lines a direct link to the reordering rules +that created them. In chained moves, the reordering rule is propagated +from stock moves to the purchase order line. + + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/153/11.0 + +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 +======= + +Contributors +------------ + +* Jordi Ballester + + +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/stock_orderpoint_purchase_link/__init__.py b/stock_orderpoint_purchase_link/__init__.py new file mode 100644 index 000000000..a9e337226 --- /dev/null +++ b/stock_orderpoint_purchase_link/__init__.py @@ -0,0 +1,2 @@ + +from . import models diff --git a/stock_orderpoint_purchase_link/__manifest__.py b/stock_orderpoint_purchase_link/__manifest__.py new file mode 100644 index 000000000..c0d2c0452 --- /dev/null +++ b/stock_orderpoint_purchase_link/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright 2017 Eficent Business and IT Consulting Services, S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Stock Orderpoint Purchase Link", + "summary": "Link Reordering rules to purchase orders", + "version": "11.0.1.0.0", + "license": "LGPL-3", + "website": "https://github.com/stock-logistics-warehouse", + "author": "Eficent, " + "Odoo Community Association (OCA)", + "category": "Warehouse Management", + "depends": [ + "stock_orderpoint_move_link", + "purchase", + ], + "data": [ + "views/purchase_order_views.xml", + ], + "installable": True, + 'auto_install': True, +} diff --git a/stock_orderpoint_purchase_link/models/__init__.py b/stock_orderpoint_purchase_link/models/__init__.py new file mode 100644 index 000000000..75fdf6149 --- /dev/null +++ b/stock_orderpoint_purchase_link/models/__init__.py @@ -0,0 +1,2 @@ +from . import purchase_order_line +from . import procurement_rule diff --git a/stock_orderpoint_purchase_link/models/procurement_rule.py b/stock_orderpoint_purchase_link/models/procurement_rule.py new file mode 100644 index 000000000..74291fb36 --- /dev/null +++ b/stock_orderpoint_purchase_link/models/procurement_rule.py @@ -0,0 +1,31 @@ +# Copyright 2017 Eficent Business and IT Consulting Services, S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from odoo import models + + +class ProcurementRule(models.Model): + _inherit = 'procurement.rule' + + def _prepare_purchase_order_line(self, product_id, product_qty, + product_uom, values, po, supplier): + vals = super(ProcurementRule, self)._prepare_purchase_order_line( + product_id, product_qty, product_uom, values, po, supplier) + # If the procurement was run directly by a reordering rule. + if 'orderpoint_id' in values: + vals['orderpoint_ids'] = [ + (4, values['orderpoint_id'].id)] + # If the procurement was run by a stock move. + elif 'orderpoint_ids' in values: + vals['orderpoint_ids'] = [(4, o.id) + for o in values['orderpoint_ids']] + return vals + + def _update_purchase_order_line(self, product_id, product_qty, product_uom, + values, line, partner): + vals = super(ProcurementRule, self)._update_purchase_order_line( + product_id, product_qty, product_uom, values, line, partner) + if 'orderpoint_id' in values: + vals['orderpoint_ids'] = [ + (4, values['orderpoint_id'].id)] + return vals diff --git a/stock_orderpoint_purchase_link/models/purchase_order_line.py b/stock_orderpoint_purchase_link/models/purchase_order_line.py new file mode 100644 index 000000000..ee747ba1b --- /dev/null +++ b/stock_orderpoint_purchase_link/models/purchase_order_line.py @@ -0,0 +1,12 @@ +# Copyright 2017 Eficent Business and IT Consulting Services, S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from odoo import api, fields, models + + +class PurchaseOrderLine(models.Model): + _inherit = 'purchase.order.line' + + orderpoint_ids = fields.Many2many( + comodel_name='stock.warehouse.orderpoint', + string='Orderpoints', copy=False) diff --git a/stock_orderpoint_purchase_link/static/description/icon.png b/stock_orderpoint_purchase_link/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/stock_orderpoint_purchase_link/views/purchase_order_views.xml b/stock_orderpoint_purchase_link/views/purchase_order_views.xml new file mode 100644 index 000000000..1ebd4d8fb --- /dev/null +++ b/stock_orderpoint_purchase_link/views/purchase_order_views.xml @@ -0,0 +1,35 @@ + + + + + purchase.order.form + purchase.order + + + + + + + + + + + + + + + purchase.order.line.form2 + purchase.order.line + + + + + + + + + + From 202028d183c4b563b86463533a69e3083620d9a4 Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Wed, 16 May 2018 11:39:04 +0530 Subject: [PATCH 02/16] remove unused api from imported --- stock_orderpoint_purchase_link/models/purchase_order_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_orderpoint_purchase_link/models/purchase_order_line.py b/stock_orderpoint_purchase_link/models/purchase_order_line.py index ee747ba1b..a4f2cdc60 100644 --- a/stock_orderpoint_purchase_link/models/purchase_order_line.py +++ b/stock_orderpoint_purchase_link/models/purchase_order_line.py @@ -1,7 +1,7 @@ # Copyright 2017 Eficent Business and IT Consulting Services, S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from odoo import api, fields, models +from odoo import fields, models class PurchaseOrderLine(models.Model): From d3d474536c5ce02c9849d5d4c34f9a59ccb66cf6 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Wed, 30 May 2018 16:24:48 +0200 Subject: [PATCH 03/16] [11.0] stock_orderpoint_purchase_link: add corresponding field to PO lines on orderpoint --- stock_orderpoint_purchase_link/__manifest__.py | 4 ++-- stock_orderpoint_purchase_link/models/__init__.py | 1 + .../models/procurement_rule.py | 2 +- .../models/purchase_order_line.py | 6 ++++-- .../models/stock_warehouse_orderpoint.py | 14 ++++++++++++++ .../views/purchase_order_views.xml | 2 +- 6 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 stock_orderpoint_purchase_link/models/stock_warehouse_orderpoint.py diff --git a/stock_orderpoint_purchase_link/__manifest__.py b/stock_orderpoint_purchase_link/__manifest__.py index c0d2c0452..5301a80bf 100644 --- a/stock_orderpoint_purchase_link/__manifest__.py +++ b/stock_orderpoint_purchase_link/__manifest__.py @@ -1,10 +1,10 @@ -# Copyright 2017 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "Stock Orderpoint Purchase Link", "summary": "Link Reordering rules to purchase orders", - "version": "11.0.1.0.0", + "version": "11.0.1.0.1", "license": "LGPL-3", "website": "https://github.com/stock-logistics-warehouse", "author": "Eficent, " diff --git a/stock_orderpoint_purchase_link/models/__init__.py b/stock_orderpoint_purchase_link/models/__init__.py index 75fdf6149..81b3cd1b7 100644 --- a/stock_orderpoint_purchase_link/models/__init__.py +++ b/stock_orderpoint_purchase_link/models/__init__.py @@ -1,2 +1,3 @@ from . import purchase_order_line from . import procurement_rule +from . import stock_warehouse_orderpoint diff --git a/stock_orderpoint_purchase_link/models/procurement_rule.py b/stock_orderpoint_purchase_link/models/procurement_rule.py index 74291fb36..244d02516 100644 --- a/stock_orderpoint_purchase_link/models/procurement_rule.py +++ b/stock_orderpoint_purchase_link/models/procurement_rule.py @@ -1,4 +1,4 @@ -# Copyright 2017 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from odoo import models diff --git a/stock_orderpoint_purchase_link/models/purchase_order_line.py b/stock_orderpoint_purchase_link/models/purchase_order_line.py index a4f2cdc60..263e799cf 100644 --- a/stock_orderpoint_purchase_link/models/purchase_order_line.py +++ b/stock_orderpoint_purchase_link/models/purchase_order_line.py @@ -1,4 +1,4 @@ -# Copyright 2017 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from odoo import fields, models @@ -9,4 +9,6 @@ class PurchaseOrderLine(models.Model): orderpoint_ids = fields.Many2many( comodel_name='stock.warehouse.orderpoint', - string='Orderpoints', copy=False) + string='Orderpoints', copy=False, + readonly=True, + ) diff --git a/stock_orderpoint_purchase_link/models/stock_warehouse_orderpoint.py b/stock_orderpoint_purchase_link/models/stock_warehouse_orderpoint.py new file mode 100644 index 000000000..a0771580f --- /dev/null +++ b/stock_orderpoint_purchase_link/models/stock_warehouse_orderpoint.py @@ -0,0 +1,14 @@ +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from odoo import fields, models + + +class StockWarehouseOrderpoint(models.Model): + _inherit = 'stock.warehouse.orderpoint' + + purchase_line_ids = fields.Many2many( + comodel_name='purchase.order.line', + string='Purchase Order Lines', copy=False, + readonly=True, + ) diff --git a/stock_orderpoint_purchase_link/views/purchase_order_views.xml b/stock_orderpoint_purchase_link/views/purchase_order_views.xml index 1ebd4d8fb..198818ac6 100644 --- a/stock_orderpoint_purchase_link/views/purchase_order_views.xml +++ b/stock_orderpoint_purchase_link/views/purchase_order_views.xml @@ -1,5 +1,5 @@ - From 0719b28828b6590602d1d70316eae7a4823ce887 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Thu, 31 May 2018 14:58:14 +0200 Subject: [PATCH 04/16] [11.0][FIX] stock_orderpoint_purchase_link: * update PO line passes orderpoints * add tests --- .../__manifest__.py | 2 +- .../models/procurement_rule.py | 4 + .../tests/__init__.py | 1 + .../test_stock_orderpoint_purchase_link.py | 77 +++++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 stock_orderpoint_purchase_link/tests/__init__.py create mode 100644 stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py diff --git a/stock_orderpoint_purchase_link/__manifest__.py b/stock_orderpoint_purchase_link/__manifest__.py index 5301a80bf..0950f40b7 100644 --- a/stock_orderpoint_purchase_link/__manifest__.py +++ b/stock_orderpoint_purchase_link/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Stock Orderpoint Purchase Link", "summary": "Link Reordering rules to purchase orders", - "version": "11.0.1.0.1", + "version": "11.0.1.0.2", "license": "LGPL-3", "website": "https://github.com/stock-logistics-warehouse", "author": "Eficent, " diff --git a/stock_orderpoint_purchase_link/models/procurement_rule.py b/stock_orderpoint_purchase_link/models/procurement_rule.py index 244d02516..27c7da61a 100644 --- a/stock_orderpoint_purchase_link/models/procurement_rule.py +++ b/stock_orderpoint_purchase_link/models/procurement_rule.py @@ -28,4 +28,8 @@ class ProcurementRule(models.Model): if 'orderpoint_id' in values: vals['orderpoint_ids'] = [ (4, values['orderpoint_id'].id)] + # If the procurement was run by a stock move. + elif 'orderpoint_ids' in values: + vals['orderpoint_ids'] = [(4, o.id) + for o in values['orderpoint_ids']] return vals diff --git a/stock_orderpoint_purchase_link/tests/__init__.py b/stock_orderpoint_purchase_link/tests/__init__.py new file mode 100644 index 000000000..b88d2929f --- /dev/null +++ b/stock_orderpoint_purchase_link/tests/__init__.py @@ -0,0 +1 @@ +from . import test_stock_orderpoint_purchase_link diff --git a/stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py b/stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py new file mode 100644 index 000000000..accd6e31d --- /dev/null +++ b/stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py @@ -0,0 +1,77 @@ +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0). + +from odoo.tests import common + + +class TestOrderpointPurchaseLink(common.TransactionCase): + def setUp(self): + super(TestOrderpointPurchaseLink, self).setUp() + + self.product_obj = self.env['product.product'] + self.partner_obj = self.env['res.partner'] + self.pol_obj = self.env['purchase.order.line'] + self.location_obj = self.env['stock.location'] + self.orderpoint_obj = self.env['stock.warehouse.orderpoint'] + self.route_obj = self.env['stock.location.route'] + self.rule_obj = self.env['procurement.rule'] + self.group_obj = self.env['procurement.group'] + + # WH and routes: + self.warehouse = self.env.ref('stock.warehouse0') + self.stock_location = self.warehouse.lot_stock_id + self.test_location = self.location_obj.create({ + 'name': 'Test', + 'location_id': self.warehouse.view_location_id.id, + }) + route_buy = self.env.ref('purchase.route_warehouse0_buy').id + route_test = self.route_obj.create({ + 'name': 'Stock to Test', + }).id + self.rule_obj.create({ + 'name': 'Stock to Test', + 'action': 'move', + 'procure_method': 'make_to_order', + 'location_id': self.test_location.id, + 'location_src_id': self.stock_location.id, + 'route_id': route_test, + 'picking_type_id': self.warehouse.int_type_id.id, + 'warehouse_id': self.warehouse.id, + 'group_propagation_option': 'none', + }) + # Partners: + vendor1 = self.partner_obj.create({'name': 'Vendor 1'}) + + # Create products: + self.tp1 = self.product_obj.create({ + 'name': 'Test Product 1', + 'type': 'product', + 'list_price': 150.0, + 'route_ids': [(6, 0, [route_buy, route_test])], + 'seller_ids': [(0, 0, {'name': vendor1.id, 'price': 20.0})], + }) + + # Create Orderpoints: + self.op1 = self.orderpoint_obj.create({ + 'product_id': self.tp1.id, + 'location_id': self.stock_location.id, + 'product_min_qty': 5.0, + 'product_max_qty': 20.0, + }) + self.op2 = self.orderpoint_obj.create({ + 'product_id': self.tp1.id, + 'location_id': self.test_location.id, + 'product_min_qty': 5.0, + 'product_max_qty': 20.0, + }) + + def test_01_po_line_from_orderpoints(self): + """Test that a PO line created/updated by two orderpoints keeps + the link with both of them.""" + self.group_obj.run_scheduler() + po_line = self.env['purchase.order.line'].search( + [('product_id', '=', self.tp1.id)]) + self.assertTrue(po_line) + # Each orderpoint must have required 20.0 units: + self.assertEqual(po_line.product_qty, 40.0) + self.assertEqual(len(po_line.orderpoint_ids), 2) From e4026bdc304a6f98ad19722e976ca58d3c9370d1 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 21 Jun 2018 13:48:18 +0000 Subject: [PATCH 05/16] [UPD] Update stock_orderpoint_purchase_link.pot --- .../i18n/stock_orderpoint_purchase_link.pot | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot diff --git a/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot b/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot new file mode 100644 index 000000000..e02276da2 --- /dev/null +++ b/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_orderpoint_purchase_link +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.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: stock_orderpoint_purchase_link +#: model:ir.model,name:stock_orderpoint_purchase_link.model_stock_warehouse_orderpoint +msgid "Minimum Inventory Rule" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_purchase_order_line_orderpoint_ids +#: model:ir.ui.view,arch_db:stock_orderpoint_purchase_link.purchase_order_form +#: model:ir.ui.view,arch_db:stock_orderpoint_purchase_link.purchase_order_line_form2 +msgid "Orderpoints" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model,name:stock_orderpoint_purchase_link.model_procurement_rule +msgid "Procurement Rule" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model,name:stock_orderpoint_purchase_link.model_purchase_order_line +msgid "Purchase Order Line" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_stock_warehouse_orderpoint_purchase_line_ids +msgid "Purchase Order Lines" +msgstr "" + From 0febddef95931cdf95b4a1a375206fc717cffbb0 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Tue, 26 Jun 2018 11:40:51 -0500 Subject: [PATCH 06/16] Update __manifest__.py --- stock_orderpoint_purchase_link/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_orderpoint_purchase_link/__manifest__.py b/stock_orderpoint_purchase_link/__manifest__.py index 0950f40b7..eacb4352a 100644 --- a/stock_orderpoint_purchase_link/__manifest__.py +++ b/stock_orderpoint_purchase_link/__manifest__.py @@ -6,7 +6,7 @@ "summary": "Link Reordering rules to purchase orders", "version": "11.0.1.0.2", "license": "LGPL-3", - "website": "https://github.com/stock-logistics-warehouse", + "website": "https://github.com/OCA/stock-logistics-warehouse", "author": "Eficent, " "Odoo Community Association (OCA)", "category": "Warehouse Management", From b3c3da92fce64eaa4c8e16896d1718290a9d684c Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 9 Oct 2018 09:19:21 +0000 Subject: [PATCH 07/16] [UPD] Update stock_orderpoint_purchase_link.pot --- .../i18n/stock_orderpoint_purchase_link.pot | 1 + 1 file changed, 1 insertion(+) diff --git a/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot b/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot index e02276da2..c112b5024 100644 --- a/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot +++ b/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot @@ -37,6 +37,7 @@ msgstr "" #. module: stock_orderpoint_purchase_link #: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_stock_warehouse_orderpoint_purchase_line_ids +#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_stock_warehouse_orderpoint_template_purchase_line_ids msgid "Purchase Order Lines" msgstr "" From 85db0df9b0fe13dec787477404853ef50a1693a0 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Wed, 3 Apr 2019 08:26:02 +0700 Subject: [PATCH 08/16] [12.0][MIG] stock_orderpoint_purchase_link --- stock_orderpoint_purchase_link/README.rst | 64 ++- .../__manifest__.py | 6 +- .../i18n/stock_orderpoint_purchase_link.pot | 43 -- .../models/__init__.py | 2 +- .../{procurement_rule.py => stock_rule.py} | 12 +- .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 3 + .../static/description/index.html | 422 ++++++++++++++++++ .../test_stock_orderpoint_purchase_link.py | 6 +- 9 files changed, 484 insertions(+), 76 deletions(-) delete mode 100644 stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot rename stock_orderpoint_purchase_link/models/{procurement_rule.py => stock_rule.py} (77%) create mode 100644 stock_orderpoint_purchase_link/readme/CONTRIBUTORS.rst create mode 100644 stock_orderpoint_purchase_link/readme/DESCRIPTION.rst create mode 100644 stock_orderpoint_purchase_link/static/description/index.html diff --git a/stock_orderpoint_purchase_link/README.rst b/stock_orderpoint_purchase_link/README.rst index 42fbcfef2..fae74a31d 100644 --- a/stock_orderpoint_purchase_link/README.rst +++ b/stock_orderpoint_purchase_link/README.rst @@ -1,52 +1,76 @@ -.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg - :target: https://www.gnu.org/licenses/lgpl-3.0-standalone.html - :alt: License: LGPL-3 - ============================== Stock Orderpoint Purchase Link ============================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_orderpoint_purchase_link + :alt: OCA/stock-logistics-warehouse +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_orderpoint_purchase_link + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/153/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module adds to purchase order lines a direct link to the reordering rules that created them. In chained moves, the reordering rule is propagated from stock moves to the purchase order line. +**Table of contents** -Usage -===== - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/153/11.0 +.. contents:: + :local: 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 ======= +Authors +~~~~~~~ + +* Eficent + Contributors ------------- +~~~~~~~~~~~~ * Jordi Ballester +* Kitti Upariphutthiphong. (http://ecosoft.co.th) +Maintainers +~~~~~~~~~~~ -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/stock-logistics-warehouse `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_orderpoint_purchase_link/__manifest__.py b/stock_orderpoint_purchase_link/__manifest__.py index eacb4352a..6f5a0aed6 100644 --- a/stock_orderpoint_purchase_link/__manifest__.py +++ b/stock_orderpoint_purchase_link/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Stock Orderpoint Purchase Link", "summary": "Link Reordering rules to purchase orders", - "version": "11.0.1.0.2", + "version": "12.0.1.0.0", "license": "LGPL-3", "website": "https://github.com/OCA/stock-logistics-warehouse", "author": "Eficent, " @@ -12,11 +12,11 @@ "category": "Warehouse Management", "depends": [ "stock_orderpoint_move_link", - "purchase", + "purchase_stock", ], "data": [ "views/purchase_order_views.xml", ], "installable": True, - 'auto_install': True, + "auto_install": True, } diff --git a/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot b/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot deleted file mode 100644 index c112b5024..000000000 --- a/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot +++ /dev/null @@ -1,43 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * stock_orderpoint_purchase_link -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 11.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: stock_orderpoint_purchase_link -#: model:ir.model,name:stock_orderpoint_purchase_link.model_stock_warehouse_orderpoint -msgid "Minimum Inventory Rule" -msgstr "" - -#. module: stock_orderpoint_purchase_link -#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_purchase_order_line_orderpoint_ids -#: model:ir.ui.view,arch_db:stock_orderpoint_purchase_link.purchase_order_form -#: model:ir.ui.view,arch_db:stock_orderpoint_purchase_link.purchase_order_line_form2 -msgid "Orderpoints" -msgstr "" - -#. module: stock_orderpoint_purchase_link -#: model:ir.model,name:stock_orderpoint_purchase_link.model_procurement_rule -msgid "Procurement Rule" -msgstr "" - -#. module: stock_orderpoint_purchase_link -#: model:ir.model,name:stock_orderpoint_purchase_link.model_purchase_order_line -msgid "Purchase Order Line" -msgstr "" - -#. module: stock_orderpoint_purchase_link -#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_stock_warehouse_orderpoint_purchase_line_ids -#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_stock_warehouse_orderpoint_template_purchase_line_ids -msgid "Purchase Order Lines" -msgstr "" - diff --git a/stock_orderpoint_purchase_link/models/__init__.py b/stock_orderpoint_purchase_link/models/__init__.py index 81b3cd1b7..87cace991 100644 --- a/stock_orderpoint_purchase_link/models/__init__.py +++ b/stock_orderpoint_purchase_link/models/__init__.py @@ -1,3 +1,3 @@ from . import purchase_order_line -from . import procurement_rule +from . import stock_rule from . import stock_warehouse_orderpoint diff --git a/stock_orderpoint_purchase_link/models/procurement_rule.py b/stock_orderpoint_purchase_link/models/stock_rule.py similarity index 77% rename from stock_orderpoint_purchase_link/models/procurement_rule.py rename to stock_orderpoint_purchase_link/models/stock_rule.py index 27c7da61a..72b3d8638 100644 --- a/stock_orderpoint_purchase_link/models/procurement_rule.py +++ b/stock_orderpoint_purchase_link/models/stock_rule.py @@ -4,13 +4,13 @@ from odoo import models -class ProcurementRule(models.Model): - _inherit = 'procurement.rule' +class StockRule(models.Model): + _inherit = 'stock.rule' def _prepare_purchase_order_line(self, product_id, product_qty, - product_uom, values, po, supplier): - vals = super(ProcurementRule, self)._prepare_purchase_order_line( - product_id, product_qty, product_uom, values, po, supplier) + product_uom, values, po, partner): + vals = super()._prepare_purchase_order_line( + product_id, product_qty, product_uom, values, po, partner) # If the procurement was run directly by a reordering rule. if 'orderpoint_id' in values: vals['orderpoint_ids'] = [ @@ -23,7 +23,7 @@ class ProcurementRule(models.Model): def _update_purchase_order_line(self, product_id, product_qty, product_uom, values, line, partner): - vals = super(ProcurementRule, self)._update_purchase_order_line( + vals = super()._update_purchase_order_line( product_id, product_qty, product_uom, values, line, partner) if 'orderpoint_id' in values: vals['orderpoint_ids'] = [ diff --git a/stock_orderpoint_purchase_link/readme/CONTRIBUTORS.rst b/stock_orderpoint_purchase_link/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..6edbd9d63 --- /dev/null +++ b/stock_orderpoint_purchase_link/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Jordi Ballester +* Kitti Upariphutthiphong. (http://ecosoft.co.th) diff --git a/stock_orderpoint_purchase_link/readme/DESCRIPTION.rst b/stock_orderpoint_purchase_link/readme/DESCRIPTION.rst new file mode 100644 index 000000000..4921c935b --- /dev/null +++ b/stock_orderpoint_purchase_link/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module adds to purchase order lines a direct link to the reordering rules +that created them. In chained moves, the reordering rule is propagated +from stock moves to the purchase order line. diff --git a/stock_orderpoint_purchase_link/static/description/index.html b/stock_orderpoint_purchase_link/static/description/index.html new file mode 100644 index 000000000..e1daf1e33 --- /dev/null +++ b/stock_orderpoint_purchase_link/static/description/index.html @@ -0,0 +1,422 @@ + + + + + + +Stock Orderpoint Purchase Link + + + + + + diff --git a/stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py b/stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py index accd6e31d..4c5a48057 100644 --- a/stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py +++ b/stock_orderpoint_purchase_link/tests/test_stock_orderpoint_purchase_link.py @@ -14,7 +14,7 @@ class TestOrderpointPurchaseLink(common.TransactionCase): self.location_obj = self.env['stock.location'] self.orderpoint_obj = self.env['stock.warehouse.orderpoint'] self.route_obj = self.env['stock.location.route'] - self.rule_obj = self.env['procurement.rule'] + self.rule_obj = self.env['stock.rule'] self.group_obj = self.env['procurement.group'] # WH and routes: @@ -24,13 +24,13 @@ class TestOrderpointPurchaseLink(common.TransactionCase): 'name': 'Test', 'location_id': self.warehouse.view_location_id.id, }) - route_buy = self.env.ref('purchase.route_warehouse0_buy').id + route_buy = self.env.ref('purchase_stock.route_warehouse0_buy').id route_test = self.route_obj.create({ 'name': 'Stock to Test', }).id self.rule_obj.create({ 'name': 'Stock to Test', - 'action': 'move', + 'action': 'pull', 'procure_method': 'make_to_order', 'location_id': self.test_location.id, 'location_src_id': self.stock_location.id, From a35925d6dacd9c77a7a33b997a121e0f0b069acb Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 4 Apr 2019 13:41:13 +0000 Subject: [PATCH 09/16] [UPD] Update stock_orderpoint_purchase_link.pot --- .../i18n/stock_orderpoint_purchase_link.pot | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot diff --git a/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot b/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot new file mode 100644 index 000000000..cb302eb7b --- /dev/null +++ b/stock_orderpoint_purchase_link/i18n/stock_orderpoint_purchase_link.pot @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_orderpoint_purchase_link +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.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: stock_orderpoint_purchase_link +#: model:ir.model,name:stock_orderpoint_purchase_link.model_stock_warehouse_orderpoint +msgid "Minimum Inventory Rule" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_purchase_order_line__orderpoint_ids +#: model_terms:ir.ui.view,arch_db:stock_orderpoint_purchase_link.purchase_order_form +#: model_terms:ir.ui.view,arch_db:stock_orderpoint_purchase_link.purchase_order_line_form2 +msgid "Orderpoints" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model,name:stock_orderpoint_purchase_link.model_purchase_order_line +msgid "Purchase Order Line" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model.fields,field_description:stock_orderpoint_purchase_link.field_stock_warehouse_orderpoint__purchase_line_ids +msgid "Purchase Order Lines" +msgstr "" + +#. module: stock_orderpoint_purchase_link +#: model:ir.model,name:stock_orderpoint_purchase_link.model_stock_rule +msgid "Stock Rule" +msgstr "" + From c4f7023292461a2aaaa63c3cd0b97b057223e878 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 03:43:10 +0000 Subject: [PATCH 10/16] [UPD] README.rst --- stock_orderpoint_purchase_link/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_orderpoint_purchase_link/static/description/index.html b/stock_orderpoint_purchase_link/static/description/index.html index e1daf1e33..680b6101e 100644 --- a/stock_orderpoint_purchase_link/static/description/index.html +++ b/stock_orderpoint_purchase_link/static/description/index.html @@ -3,7 +3,7 @@ - + Stock Orderpoint Purchase Link