From 37e268d12c02b4affd241ce7c1f2b757490e9226 Mon Sep 17 00:00:00 2001 From: jbeficent Date: Wed, 17 Feb 2016 15:49:35 +0100 Subject: [PATCH 01/10] [ADD] purchase request operating unit [FIX] remove reference to warehouse [ENH] purchase_request_operating_unit, purchase_rquest_procurement_operating_unit 9.0 purchase request operating unit - fixed travis (#81) * [FIX] travis --- .../README.rst | 56 +++++++++++++++++++ .../__init__.py | 6 ++ .../__openerp__.py | 19 +++++++ .../tests/__init__.py | 6 ++ ...e_request_to_requisition_operating_unit.py | 53 ++++++++++++++++++ .../wizard/__init__.py | 5 ++ ..._request_line_make_purchase_requisition.py | 46 +++++++++++++++ 7 files changed, 191 insertions(+) create mode 100644 purchase_request_to_requisition_operating_unit/README.rst create mode 100644 purchase_request_to_requisition_operating_unit/__init__.py create mode 100644 purchase_request_to_requisition_operating_unit/__openerp__.py create mode 100644 purchase_request_to_requisition_operating_unit/tests/__init__.py create mode 100644 purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py create mode 100644 purchase_request_to_requisition_operating_unit/wizard/__init__.py create mode 100644 purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py diff --git a/purchase_request_to_requisition_operating_unit/README.rst b/purchase_request_to_requisition_operating_unit/README.rst new file mode 100644 index 0000000000..5ea6828062 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/README.rst @@ -0,0 +1,56 @@ +.. image:: https://img.shields.io/badge/license-LGPLv3-blue.svg + :target: https://www.gnu.org/licenses/lgpl.html + :alt: License: LGPL-3 + +====================================================== +Purchase Request to Call for Bids with Operating Units +====================================================== + +This module introduces the following features: + +* This module pass the Operating Unit from the purchase request to the bid. + +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/213/9.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 smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Jordi Ballester Alomar +* Aaron Henriquez +* Serpent Consulting Services Pvt. Ltd. + +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_request_to_requisition_operating_unit/__init__.py b/purchase_request_to_requisition_operating_unit/__init__.py new file mode 100644 index 0000000000..2d1268b146 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Serpent Consulting Services Pvt. Ltd. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import wizard diff --git a/purchase_request_to_requisition_operating_unit/__openerp__.py b/purchase_request_to_requisition_operating_unit/__openerp__.py new file mode 100644 index 0000000000..236c7931b6 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/__openerp__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Serpent Consulting Services Pvt. Ltd. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Purchase Request to Call for Bids with Operating Units", + "version": "9.0.1.0.0", + "author": "Eficent" + "Serpent Consulting Services Pvt. Ltd.," + "Odoo Community Association (OCA)", + "license": "LGPL-3", + "website": "http://www.eficent.com", + "category": "Purchase Management", + "depends": ["purchase_request_to_requisition", + "purchase_request_operating_unit", + "purchase_requisition_operating_unit"], + 'installable': True, +} diff --git a/purchase_request_to_requisition_operating_unit/tests/__init__.py b/purchase_request_to_requisition_operating_unit/tests/__init__.py new file mode 100644 index 0000000000..b6c4bb2d12 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/tests/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Serpent Consulting Services Pvt. Ltd. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import test_purchase_request_to_requisition_operating_unit diff --git a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py new file mode 100644 index 0000000000..09083d4c2b --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Serpent Consulting Services Pvt. Ltd. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +from openerp.tests import common +from openerp.tools import SUPERUSER_ID + + +class TestPurchaseRequestToRequisition(common.TransactionCase): + + def setUp(self): + super(TestPurchaseRequestToRequisition, self).setUp() + self.purchase_request = self.env['purchase.request'] + self.purchase_request_line_obj = self.env['purchase.request.line'] + self.wiz =\ + self.env['purchase.request.line.make.purchase.requisition'] + self.purchase_requisition_partner_model =\ + self.env['purchase.requisition.partner'] + self.purchase_order = self.env['purchase.order'] + # Main Operating Unit + self.ou1 = self.env.ref('operating_unit.main_operating_unit') + # Products + self.product1 = self.env.ref('product.product_product_9') + self._create_purchase_request() + + def _create_purchase_request(self): + vals = { + 'picking_type_id': self.env.ref('stock.picking_type_in').id, + 'requested_by': SUPERUSER_ID, + 'operating_unit_id': self.ou1.id + } + purchase_request = self.purchase_request.create(vals) + vals = { + 'request_id': purchase_request.id, + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref('product.product_uom_unit').id, + 'product_qty': 5.0, + } + self.purchase_request_line =\ + self.purchase_request_line_obj.create(vals) + + def test_purchase_request_to_purchase_requisition(self): + wiz = self.wiz.with_context( + active_model="purchase.request.line", + active_ids=[self.purchase_request_line.id], + active_id=self.purchase_request_line.id).create({}) + wiz.make_purchase_requisition() + requisition_id =\ + self.purchase_request_line.requisition_lines.requisition_id + self.assertEqual( + requisition_id.operating_unit_id, + self.purchase_request_line.operating_unit_id, + 'Should have the same Operating Unit') diff --git a/purchase_request_to_requisition_operating_unit/wizard/__init__.py b/purchase_request_to_requisition_operating_unit/wizard/__init__.py new file mode 100644 index 0000000000..c7ea810b53 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/wizard/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Serpent Consulting Services Pvt. Ltd. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +from . import purchase_request_line_make_purchase_requisition diff --git a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py new file mode 100644 index 0000000000..3b99345ed9 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Serpent Consulting Services Pvt. Ltd. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +from openerp import api, fields, models, _ +from openerp.exceptions import except_orm + + +class PurchaseRequestLineMakePurchaseRequisition(models.TransientModel): + _inherit = "purchase.request.line.make.purchase.requisition" + + operating_unit_id = fields.Many2one( + 'operating.unit', + string='Operating Unit', + readonly=True, + ) + + @api.model + def default_get(self, fields): + res = super(PurchaseRequestLineMakePurchaseRequisition, self).\ + default_get(fields) + request_line_obj = self.env['purchase.request.line'] + request_line_ids = self._context.get('active_ids', []) + operating_unit_id = False + for line in request_line_obj.browse(request_line_ids): + line_operating_unit_id = line.request_id.operating_unit_id \ + and line.request_id.operating_unit_id.id or False + if operating_unit_id\ + and line_operating_unit_id != operating_unit_id: + raise except_orm( + _('Could not process !'), + _('You have to select lines ' + 'from the same operating unit.')) + else: + operating_unit_id = line_operating_unit_id + res['operating_unit_id'] = operating_unit_id + return res + + @api.model + def _prepare_purchase_requisition(self, picking_type_id, + company_id): + res = super(PurchaseRequestLineMakePurchaseRequisition, self).\ + _prepare_purchase_requisition(picking_type_id, company_id) + if self.operating_unit_id: + res.update({'operating_unit_id': self.operating_unit_id.id}) + return res From a5de2c9d45451250ba3c0c321f246fd4e9b7265a Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 3 Apr 2019 03:10:48 +0000 Subject: [PATCH 02/10] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 purchase_request_to_requisition_operating_unit/static/description/icon.png diff --git a/purchase_request_to_requisition_operating_unit/static/description/icon.png b/purchase_request_to_requisition_operating_unit/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 From 64b398c7fc35b8af0fd14ea8ac2bb6ab2b96392f Mon Sep 17 00:00:00 2001 From: Kitti U Date: Mon, 14 Jun 2021 14:46:38 +0700 Subject: [PATCH 03/10] [IMP] : black, isort, prettier --- .../__init__.py | 1 - .../__openerp__.py | 17 +++---- .../tests/__init__.py | 1 - ...e_request_to_requisition_operating_unit.py | 46 +++++++++---------- .../wizard/__init__.py | 1 - ..._request_line_make_purchase_requisition.py | 44 +++++++++--------- 6 files changed, 54 insertions(+), 56 deletions(-) diff --git a/purchase_request_to_requisition_operating_unit/__init__.py b/purchase_request_to_requisition_operating_unit/__init__.py index 2d1268b146..f8808ccea8 100644 --- a/purchase_request_to_requisition_operating_unit/__init__.py +++ b/purchase_request_to_requisition_operating_unit/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). diff --git a/purchase_request_to_requisition_operating_unit/__openerp__.py b/purchase_request_to_requisition_operating_unit/__openerp__.py index 236c7931b6..5ad9cce19c 100644 --- a/purchase_request_to_requisition_operating_unit/__openerp__.py +++ b/purchase_request_to_requisition_operating_unit/__openerp__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). @@ -7,13 +6,15 @@ "name": "Purchase Request to Call for Bids with Operating Units", "version": "9.0.1.0.0", "author": "Eficent" - "Serpent Consulting Services Pvt. Ltd.," - "Odoo Community Association (OCA)", + "Serpent Consulting Services Pvt. Ltd.," + "Odoo Community Association (OCA)", "license": "LGPL-3", - "website": "http://www.eficent.com", + "website": "https://github.com/OCA/operating-unit", "category": "Purchase Management", - "depends": ["purchase_request_to_requisition", - "purchase_request_operating_unit", - "purchase_requisition_operating_unit"], - 'installable': True, + "depends": [ + "purchase_request_to_requisition", + "purchase_request_operating_unit", + "purchase_requisition_operating_unit", + ], + "installable": True, } diff --git a/purchase_request_to_requisition_operating_unit/tests/__init__.py b/purchase_request_to_requisition_operating_unit/tests/__init__.py index b6c4bb2d12..c153a8e06f 100644 --- a/purchase_request_to_requisition_operating_unit/tests/__init__.py +++ b/purchase_request_to_requisition_operating_unit/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). diff --git a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py index 09083d4c2b..b6cb93abdd 100644 --- a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py +++ b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). @@ -7,47 +6,46 @@ class TestPurchaseRequestToRequisition(common.TransactionCase): - def setUp(self): super(TestPurchaseRequestToRequisition, self).setUp() - self.purchase_request = self.env['purchase.request'] - self.purchase_request_line_obj = self.env['purchase.request.line'] - self.wiz =\ - self.env['purchase.request.line.make.purchase.requisition'] - self.purchase_requisition_partner_model =\ - self.env['purchase.requisition.partner'] - self.purchase_order = self.env['purchase.order'] + self.purchase_request = self.env["purchase.request"] + self.purchase_request_line_obj = self.env["purchase.request.line"] + self.wiz = self.env["purchase.request.line.make.purchase.requisition"] + self.purchase_requisition_partner_model = self.env[ + "purchase.requisition.partner" + ] + self.purchase_order = self.env["purchase.order"] # Main Operating Unit - self.ou1 = self.env.ref('operating_unit.main_operating_unit') + self.ou1 = self.env.ref("operating_unit.main_operating_unit") # Products - self.product1 = self.env.ref('product.product_product_9') + self.product1 = self.env.ref("product.product_product_9") self._create_purchase_request() def _create_purchase_request(self): vals = { - 'picking_type_id': self.env.ref('stock.picking_type_in').id, - 'requested_by': SUPERUSER_ID, - 'operating_unit_id': self.ou1.id + "picking_type_id": self.env.ref("stock.picking_type_in").id, + "requested_by": SUPERUSER_ID, + "operating_unit_id": self.ou1.id, } purchase_request = self.purchase_request.create(vals) vals = { - 'request_id': purchase_request.id, - 'product_id': self.product1.id, - 'product_uom_id': self.env.ref('product.product_uom_unit').id, - 'product_qty': 5.0, + "request_id": purchase_request.id, + "product_id": self.product1.id, + "product_uom_id": self.env.ref("product.product_uom_unit").id, + "product_qty": 5.0, } - self.purchase_request_line =\ - self.purchase_request_line_obj.create(vals) + self.purchase_request_line = self.purchase_request_line_obj.create(vals) def test_purchase_request_to_purchase_requisition(self): wiz = self.wiz.with_context( active_model="purchase.request.line", active_ids=[self.purchase_request_line.id], - active_id=self.purchase_request_line.id).create({}) + active_id=self.purchase_request_line.id, + ).create({}) wiz.make_purchase_requisition() - requisition_id =\ - self.purchase_request_line.requisition_lines.requisition_id + requisition_id = self.purchase_request_line.requisition_lines.requisition_id self.assertEqual( requisition_id.operating_unit_id, self.purchase_request_line.operating_unit_id, - 'Should have the same Operating Unit') + "Should have the same Operating Unit", + ) diff --git a/purchase_request_to_requisition_operating_unit/wizard/__init__.py b/purchase_request_to_requisition_operating_unit/wizard/__init__.py index c7ea810b53..0a0fcc0918 100644 --- a/purchase_request_to_requisition_operating_unit/wizard/__init__.py +++ b/purchase_request_to_requisition_operating_unit/wizard/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). diff --git a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py index 3b99345ed9..66add5fc07 100644 --- a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py +++ b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp import api, fields, models, _ +from openerp import _, api, fields, models from openerp.exceptions import except_orm @@ -10,37 +9,40 @@ class PurchaseRequestLineMakePurchaseRequisition(models.TransientModel): _inherit = "purchase.request.line.make.purchase.requisition" operating_unit_id = fields.Many2one( - 'operating.unit', - string='Operating Unit', + "operating.unit", + string="Operating Unit", readonly=True, ) @api.model def default_get(self, fields): - res = super(PurchaseRequestLineMakePurchaseRequisition, self).\ - default_get(fields) - request_line_obj = self.env['purchase.request.line'] - request_line_ids = self._context.get('active_ids', []) + res = super(PurchaseRequestLineMakePurchaseRequisition, self).default_get( + fields + ) + request_line_obj = self.env["purchase.request.line"] + request_line_ids = self._context.get("active_ids", []) operating_unit_id = False for line in request_line_obj.browse(request_line_ids): - line_operating_unit_id = line.request_id.operating_unit_id \ - and line.request_id.operating_unit_id.id or False - if operating_unit_id\ - and line_operating_unit_id != operating_unit_id: + line_operating_unit_id = ( + line.request_id.operating_unit_id + and line.request_id.operating_unit_id.id + or False + ) + if operating_unit_id and line_operating_unit_id != operating_unit_id: raise except_orm( - _('Could not process !'), - _('You have to select lines ' - 'from the same operating unit.')) + _("Could not process !"), + _("You have to select lines " "from the same operating unit."), + ) else: operating_unit_id = line_operating_unit_id - res['operating_unit_id'] = operating_unit_id + res["operating_unit_id"] = operating_unit_id return res @api.model - def _prepare_purchase_requisition(self, picking_type_id, - company_id): - res = super(PurchaseRequestLineMakePurchaseRequisition, self).\ - _prepare_purchase_requisition(picking_type_id, company_id) + def _prepare_purchase_requisition(self, picking_type_id, company_id): + res = super( + PurchaseRequestLineMakePurchaseRequisition, self + )._prepare_purchase_requisition(picking_type_id, company_id) if self.operating_unit_id: - res.update({'operating_unit_id': self.operating_unit_id.id}) + res.update({"operating_unit_id": self.operating_unit_id.id}) return res From 7a70c0bfdcce694b247b9b04e6f41adaba239ca1 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Mon, 14 Jun 2021 14:52:06 +0700 Subject: [PATCH 04/10] [14.0][ADD] purchase_request_to_requisition_operating_unit --- .../README.rst | 56 ------------------- .../{__openerp__.py => __manifest__.py} | 4 +- .../readme/CONTRIBUTORS.rst | 4 ++ .../readme/DESCRIPTION.rst | 3 + ...e_request_to_requisition_operating_unit.py | 9 +-- ..._request_line_make_purchase_requisition.py | 22 +++++--- 6 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 purchase_request_to_requisition_operating_unit/README.rst rename purchase_request_to_requisition_operating_unit/{__openerp__.py => __manifest__.py} (92%) create mode 100644 purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst create mode 100644 purchase_request_to_requisition_operating_unit/readme/DESCRIPTION.rst diff --git a/purchase_request_to_requisition_operating_unit/README.rst b/purchase_request_to_requisition_operating_unit/README.rst deleted file mode 100644 index 5ea6828062..0000000000 --- a/purchase_request_to_requisition_operating_unit/README.rst +++ /dev/null @@ -1,56 +0,0 @@ -.. image:: https://img.shields.io/badge/license-LGPLv3-blue.svg - :target: https://www.gnu.org/licenses/lgpl.html - :alt: License: LGPL-3 - -====================================================== -Purchase Request to Call for Bids with Operating Units -====================================================== - -This module introduces the following features: - -* This module pass the Operating Unit from the purchase request to the bid. - -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/213/9.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 smashing it by providing a detailed and welcomed feedback. - -Credits -======= - -Images ------- - -* Odoo Community Association: `Icon `_. - -Contributors ------------- - -* Jordi Ballester Alomar -* Aaron Henriquez -* Serpent Consulting Services Pvt. Ltd. - -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_request_to_requisition_operating_unit/__openerp__.py b/purchase_request_to_requisition_operating_unit/__manifest__.py similarity index 92% rename from purchase_request_to_requisition_operating_unit/__openerp__.py rename to purchase_request_to_requisition_operating_unit/__manifest__.py index 5ad9cce19c..1f7e81a23c 100644 --- a/purchase_request_to_requisition_operating_unit/__openerp__.py +++ b/purchase_request_to_requisition_operating_unit/__manifest__.py @@ -4,8 +4,8 @@ { "name": "Purchase Request to Call for Bids with Operating Units", - "version": "9.0.1.0.0", - "author": "Eficent" + "version": "14.0.1.0.0", + "author": "Eficent," "Serpent Consulting Services Pvt. Ltd.," "Odoo Community Association (OCA)", "license": "LGPL-3", diff --git a/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..7231819144 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Jordi Ballester Alomar +* Aaron Henriquez +* Serpent Consulting Services Pvt. Ltd. +* Kitti U. diff --git a/purchase_request_to_requisition_operating_unit/readme/DESCRIPTION.rst b/purchase_request_to_requisition_operating_unit/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..14eacc3155 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module introduces the following features: + +* This module pass the Operating Unit from the purchase request to the purchase agreement diff --git a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py index b6cb93abdd..b34d6f87a8 100644 --- a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py +++ b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py @@ -1,8 +1,8 @@ # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp.tests import common -from openerp.tools import SUPERUSER_ID +from odoo import SUPERUSER_ID +from odoo.tests import common class TestPurchaseRequestToRequisition(common.TransactionCase): @@ -11,9 +11,6 @@ def setUp(self): self.purchase_request = self.env["purchase.request"] self.purchase_request_line_obj = self.env["purchase.request.line"] self.wiz = self.env["purchase.request.line.make.purchase.requisition"] - self.purchase_requisition_partner_model = self.env[ - "purchase.requisition.partner" - ] self.purchase_order = self.env["purchase.order"] # Main Operating Unit self.ou1 = self.env.ref("operating_unit.main_operating_unit") @@ -31,7 +28,7 @@ def _create_purchase_request(self): vals = { "request_id": purchase_request.id, "product_id": self.product1.id, - "product_uom_id": self.env.ref("product.product_uom_unit").id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, "product_qty": 5.0, } self.purchase_request_line = self.purchase_request_line_obj.create(vals) diff --git a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py index 66add5fc07..578e14ef21 100644 --- a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py +++ b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py @@ -1,8 +1,8 @@ # © 2016 Eficent Business and IT Consulting Services S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp import _, api, fields, models -from openerp.exceptions import except_orm +from odoo import _, api, fields, models +from odoo.exceptions import UserError class PurchaseRequestLineMakePurchaseRequisition(models.TransientModel): @@ -16,11 +16,17 @@ class PurchaseRequestLineMakePurchaseRequisition(models.TransientModel): @api.model def default_get(self, fields): - res = super(PurchaseRequestLineMakePurchaseRequisition, self).default_get( - fields - ) + res = super().default_get(fields) + # By default, expect called from PR Line request_line_obj = self.env["purchase.request.line"] - request_line_ids = self._context.get("active_ids", []) + request_line_ids = self.env.context.get("active_ids") + active_model = self.env.context.get("active_model") + # For case called from PR + if active_model == "purchase.request": + request_ids = self.env.context.get("active_ids") + requests = self.env["purchase.request"].browse(request_ids) + request_line_ids = requests.mapped("line_ids").ids + active_model = "purchase.request.line" operating_unit_id = False for line in request_line_obj.browse(request_line_ids): line_operating_unit_id = ( @@ -29,9 +35,9 @@ def default_get(self, fields): or False ) if operating_unit_id and line_operating_unit_id != operating_unit_id: - raise except_orm( + raise UserError( _("Could not process !"), - _("You have to select lines " "from the same operating unit."), + _("You have to select lines from the same operating unit."), ) else: operating_unit_id = line_operating_unit_id From 0221b0d70f35fcad5cc276149593fe4ee400b147 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Wed, 1 Jun 2022 19:10:25 +0700 Subject: [PATCH 05/10] Change Eficent to Forgeflow --- .../__init__.py | 3 +-- .../__manifest__.py | 8 ++++---- .../readme/CONTRIBUTORS.rst | 4 ++-- .../tests/__init__.py | 3 +-- ...test_purchase_request_to_requisition_operating_unit.py | 4 ++-- .../wizard/__init__.py | 4 ++-- .../purchase_request_line_make_purchase_requisition.py | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/purchase_request_to_requisition_operating_unit/__init__.py b/purchase_request_to_requisition_operating_unit/__init__.py index f8808ccea8..6c41567f38 100644 --- a/purchase_request_to_requisition_operating_unit/__init__.py +++ b/purchase_request_to_requisition_operating_unit/__init__.py @@ -1,5 +1,4 @@ -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Forgeflow S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import wizard diff --git a/purchase_request_to_requisition_operating_unit/__manifest__.py b/purchase_request_to_requisition_operating_unit/__manifest__.py index 1f7e81a23c..d8b1aca824 100644 --- a/purchase_request_to_requisition_operating_unit/__manifest__.py +++ b/purchase_request_to_requisition_operating_unit/__manifest__.py @@ -1,14 +1,14 @@ -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Forgeflow S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Purchase Request to Call for Bids with Operating Units", "version": "14.0.1.0.0", - "author": "Eficent," + "author": "Forgeflow,Ecosoft," "Serpent Consulting Services Pvt. Ltd.," "Odoo Community Association (OCA)", - "license": "LGPL-3", + "license": "AGPL-3", "website": "https://github.com/OCA/operating-unit", "category": "Purchase Management", "depends": [ diff --git a/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst index 7231819144..9fc22b3a22 100644 --- a/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst +++ b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst @@ -1,4 +1,4 @@ -* Jordi Ballester Alomar -* Aaron Henriquez +* Jordi Ballester Alomar +* Aaron Henriquez * Serpent Consulting Services Pvt. Ltd. * Kitti U. diff --git a/purchase_request_to_requisition_operating_unit/tests/__init__.py b/purchase_request_to_requisition_operating_unit/tests/__init__.py index c153a8e06f..9557b31cb3 100644 --- a/purchase_request_to_requisition_operating_unit/tests/__init__.py +++ b/purchase_request_to_requisition_operating_unit/tests/__init__.py @@ -1,5 +1,4 @@ -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Forgeflow S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import test_purchase_request_to_requisition_operating_unit diff --git a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py index b34d6f87a8..c7b640b6e4 100644 --- a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py +++ b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py @@ -1,6 +1,6 @@ -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Forgeflow S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import SUPERUSER_ID from odoo.tests import common diff --git a/purchase_request_to_requisition_operating_unit/wizard/__init__.py b/purchase_request_to_requisition_operating_unit/wizard/__init__.py index 0a0fcc0918..a0aa5e3313 100644 --- a/purchase_request_to_requisition_operating_unit/wizard/__init__.py +++ b/purchase_request_to_requisition_operating_unit/wizard/__init__.py @@ -1,4 +1,4 @@ -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Forgeflow S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + from . import purchase_request_line_make_purchase_requisition diff --git a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py index 578e14ef21..b815a0110e 100644 --- a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py +++ b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py @@ -1,6 +1,6 @@ -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016 Forgeflow S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import _, api, fields, models from odoo.exceptions import UserError From 9bd8fc5404867456a58dd384da8b99bf197177b5 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 28 Oct 2022 12:18:27 +0000 Subject: [PATCH 06/10] [UPD] README.rst --- .../README.rst | 80 ++++ .../static/description/index.html | 427 ++++++++++++++++++ 2 files changed, 507 insertions(+) create mode 100644 purchase_request_to_requisition_operating_unit/README.rst create mode 100644 purchase_request_to_requisition_operating_unit/static/description/index.html diff --git a/purchase_request_to_requisition_operating_unit/README.rst b/purchase_request_to_requisition_operating_unit/README.rst new file mode 100644 index 0000000000..33789523ac --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/README.rst @@ -0,0 +1,80 @@ +====================================================== +Purchase Request to Call for Bids with Operating Units +====================================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Foperating--unit-lightgray.png?logo=github + :target: https://github.com/OCA/operating-unit/tree/14.0/purchase_request_to_requisition_operating_unit + :alt: OCA/operating-unit +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/operating-unit-14-0/operating-unit-14-0-purchase_request_to_requisition_operating_unit + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/213/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module introduces the following features: + +* This module pass the Operating Unit from the purchase request to the purchase agreement + +**Table of contents** + +.. 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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Forgeflow +* Ecosoft +* Serpent Consulting Services Pvt. Ltd. + +Contributors +~~~~~~~~~~~~ + +* Jordi Ballester Alomar +* Aaron Henriquez +* Serpent Consulting Services Pvt. Ltd. +* Kitti U. + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/operating-unit `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_request_to_requisition_operating_unit/static/description/index.html b/purchase_request_to_requisition_operating_unit/static/description/index.html new file mode 100644 index 0000000000..733f50f1d8 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/static/description/index.html @@ -0,0 +1,427 @@ + + + + + + +Purchase Request to Call for Bids with Operating Units + + + +
+

Purchase Request to Call for Bids with Operating Units

+ + +

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

+

This module introduces the following features:

+
    +
  • This module pass the Operating Unit from the purchase request to the purchase agreement
    • +
+

Table of contents

+ +
+

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

+
    +
  • Forgeflow
    • +
  • Ecosoft
    • +
  • Serpent Consulting Services Pvt. Ltd.
    • +
+
+
+

Contributors

+ +
+
+

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

+

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

+
+
+
+ + From 2ca1c7067713b27c7534e2d42b5168a9f28da05d Mon Sep 17 00:00:00 2001 From: oca-ci Date: Tue, 17 Jan 2023 15:30:50 +0000 Subject: [PATCH 07/10] [UPD] Update purchase_request_to_requisition_operating_unit.pot --- ..._request_to_requisition_operating_unit.pot | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 purchase_request_to_requisition_operating_unit/i18n/purchase_request_to_requisition_operating_unit.pot diff --git a/purchase_request_to_requisition_operating_unit/i18n/purchase_request_to_requisition_operating_unit.pot b/purchase_request_to_requisition_operating_unit/i18n/purchase_request_to_requisition_operating_unit.pot new file mode 100644 index 0000000000..03fd99f161 --- /dev/null +++ b/purchase_request_to_requisition_operating_unit/i18n/purchase_request_to_requisition_operating_unit.pot @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_request_to_requisition_operating_unit +# +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_request_to_requisition_operating_unit +#: code:addons/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py:0 +#, python-format +msgid "Could not process !" +msgstr "" + +#. module: purchase_request_to_requisition_operating_unit +#: model:ir.model.fields,field_description:purchase_request_to_requisition_operating_unit.field_purchase_request_line_make_purchase_requisition__display_name +msgid "Display Name" +msgstr "" + +#. module: purchase_request_to_requisition_operating_unit +#: model:ir.model.fields,field_description:purchase_request_to_requisition_operating_unit.field_purchase_request_line_make_purchase_requisition__id +msgid "ID" +msgstr "" + +#. module: purchase_request_to_requisition_operating_unit +#: model:ir.model.fields,field_description:purchase_request_to_requisition_operating_unit.field_purchase_request_line_make_purchase_requisition____last_update +msgid "Last Modified on" +msgstr "" + +#. module: purchase_request_to_requisition_operating_unit +#: model:ir.model.fields,field_description:purchase_request_to_requisition_operating_unit.field_purchase_request_line_make_purchase_requisition__operating_unit_id +msgid "Operating Unit" +msgstr "" + +#. module: purchase_request_to_requisition_operating_unit +#: model:ir.model,name:purchase_request_to_requisition_operating_unit.model_purchase_request_line_make_purchase_requisition +msgid "Purchase Request Line Make Purchase Agreement" +msgstr "" + +#. module: purchase_request_to_requisition_operating_unit +#: code:addons/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py:0 +#, python-format +msgid "You have to select lines from the same operating unit." +msgstr "" From 1d81ceb7e94dc314d17a0a7aaa33480677b9c0b0 Mon Sep 17 00:00:00 2001 From: Saran440 Date: Tue, 31 Jan 2023 15:31:37 +0700 Subject: [PATCH 08/10] [IMP] purchase_request_to_requisition_operating_unit: black, isort, prettier --- .../addons/purchase_request_to_requisition_operating_unit | 1 + .../purchase_request_to_requisition_operating_unit/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/purchase_request_to_requisition_operating_unit/odoo/addons/purchase_request_to_requisition_operating_unit create mode 100644 setup/purchase_request_to_requisition_operating_unit/setup.py diff --git a/setup/purchase_request_to_requisition_operating_unit/odoo/addons/purchase_request_to_requisition_operating_unit b/setup/purchase_request_to_requisition_operating_unit/odoo/addons/purchase_request_to_requisition_operating_unit new file mode 120000 index 0000000000..ba8fd1d714 --- /dev/null +++ b/setup/purchase_request_to_requisition_operating_unit/odoo/addons/purchase_request_to_requisition_operating_unit @@ -0,0 +1 @@ +../../../../purchase_request_to_requisition_operating_unit \ No newline at end of file diff --git a/setup/purchase_request_to_requisition_operating_unit/setup.py b/setup/purchase_request_to_requisition_operating_unit/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/purchase_request_to_requisition_operating_unit/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From bfb725fbc0ed945eac43f96aa18b5c4b66512949 Mon Sep 17 00:00:00 2001 From: Saran440 Date: Tue, 31 Jan 2023 16:42:40 +0700 Subject: [PATCH 09/10] [15.0][MIG] purchase_request_to_requisition_operating_unit --- .../__manifest__.py | 2 +- .../readme/CONTRIBUTORS.rst | 1 + ...e_request_to_requisition_operating_unit.py | 59 ++++++++++++++----- ..._request_line_make_purchase_requisition.py | 6 +- 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/purchase_request_to_requisition_operating_unit/__manifest__.py b/purchase_request_to_requisition_operating_unit/__manifest__.py index d8b1aca824..99aec7a19d 100644 --- a/purchase_request_to_requisition_operating_unit/__manifest__.py +++ b/purchase_request_to_requisition_operating_unit/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Purchase Request to Call for Bids with Operating Units", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "author": "Forgeflow,Ecosoft," "Serpent Consulting Services Pvt. Ltd.," "Odoo Community Association (OCA)", diff --git a/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst index 9fc22b3a22..55c908c178 100644 --- a/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst +++ b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Aaron Henriquez * Serpent Consulting Services Pvt. Ltd. * Kitti U. +* Saran Lim. \ No newline at end of file diff --git a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py index c7b640b6e4..9627189cef 100644 --- a/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py +++ b/purchase_request_to_requisition_operating_unit/tests/test_purchase_request_to_requisition_operating_unit.py @@ -1,11 +1,13 @@ # © 2016 Forgeflow S.L. # © 2016 Serpent Consulting Services Pvt. Ltd. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + from odoo import SUPERUSER_ID -from odoo.tests import common +from odoo.exceptions import UserError +from odoo.tests.common import Form, TransactionCase -class TestPurchaseRequestToRequisition(common.TransactionCase): +class TestPurchaseRequestToRequisition(TransactionCase): def setUp(self): super(TestPurchaseRequestToRequisition, self).setUp() self.purchase_request = self.env["purchase.request"] @@ -14,30 +16,59 @@ def setUp(self): self.purchase_order = self.env["purchase.order"] # Main Operating Unit self.ou1 = self.env.ref("operating_unit.main_operating_unit") + # B2C Operating Unit + self.b2c = self.env.ref("operating_unit.b2c_operating_unit") # Products self.product1 = self.env.ref("product.product_product_9") - self._create_purchase_request() + self.purchase_request = self._create_purchase_request() def _create_purchase_request(self): vals = { "picking_type_id": self.env.ref("stock.picking_type_in").id, "requested_by": SUPERUSER_ID, "operating_unit_id": self.ou1.id, + "line_ids": [ + ( + 0, + 0, + { + "product_id": self.product1.id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, + "product_qty": 5.0, + }, + ) + ], } - purchase_request = self.purchase_request.create(vals) - vals = { - "request_id": purchase_request.id, - "product_id": self.product1.id, - "product_uom_id": self.env.ref("uom.product_uom_unit").id, - "product_qty": 5.0, - } - self.purchase_request_line = self.purchase_request_line_obj.create(vals) + return self.purchase_request.create(vals) def test_purchase_request_to_purchase_requisition(self): + # Test multi purchase request with diff operating unit + self.purchase_request2 = self._create_purchase_request() + picking_type = self.env["stock.picking.type"].search( + [ + ("code", "=", "incoming"), + ("warehouse_id.operating_unit_id", "=", self.b2c.id), + ], + limit=1, + ) + with Form(self.purchase_request2) as pr: + pr.picking_type_id = picking_type + pr.operating_unit_id = self.b2c + pr.save() + self.purchase_request_line = self.purchase_request.line_ids + # Lines with difference ou, should error + with self.assertRaises(UserError): + self.wiz.with_context( + active_model="purchase.request.line", + active_ids=[ + self.purchase_request_line.id, + self.purchase_request2.line_ids.id, + ], + ).create({}) + # Check send context with purchase.request wiz = self.wiz.with_context( - active_model="purchase.request.line", - active_ids=[self.purchase_request_line.id], - active_id=self.purchase_request_line.id, + active_model="purchase.request", + active_ids=[self.purchase_request.id], ).create({}) wiz.make_purchase_requisition() requisition_id = self.purchase_request_line.requisition_lines.requisition_id diff --git a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py index b815a0110e..549ad72dd7 100644 --- a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py +++ b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py @@ -36,8 +36,10 @@ def default_get(self, fields): ) if operating_unit_id and line_operating_unit_id != operating_unit_id: raise UserError( - _("Could not process !"), - _("You have to select lines from the same operating unit."), + _( + "Could not process!\ + \nYou have to select lines from the same operating unit." + ), ) else: operating_unit_id = line_operating_unit_id From f1ff129429c7cb1123816a1e873e5d5fcf98423f Mon Sep 17 00:00:00 2001 From: ps-tubtim Date: Wed, 8 Mar 2023 09:43:55 +0700 Subject: [PATCH 10/10] [FIX] purchase_request_to_requisition_operating_unit: fix _prepare_purchase_requisition --- .../readme/CONTRIBUTORS.rst | 2 +- .../wizard/purchase_request_line_make_purchase_requisition.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst index 55c908c178..4e39cff197 100644 --- a/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst +++ b/purchase_request_to_requisition_operating_unit/readme/CONTRIBUTORS.rst @@ -2,4 +2,4 @@ * Aaron Henriquez * Serpent Consulting Services Pvt. Ltd. * Kitti U. -* Saran Lim. \ No newline at end of file +* Saran Lim. diff --git a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py index 549ad72dd7..2a124733e4 100644 --- a/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py +++ b/purchase_request_to_requisition_operating_unit/wizard/purchase_request_line_make_purchase_requisition.py @@ -47,10 +47,10 @@ def default_get(self, fields): return res @api.model - def _prepare_purchase_requisition(self, picking_type_id, company_id): + def _prepare_purchase_requisition(self, item, picking_type_id, company_id): res = super( PurchaseRequestLineMakePurchaseRequisition, self - )._prepare_purchase_requisition(picking_type_id, company_id) + )._prepare_purchase_requisition(item, picking_type_id, company_id) if self.operating_unit_id: res.update({"operating_unit_id": self.operating_unit_id.id}) return res