From 969e854a680bb7ecc15f5c9614f79317779db534 Mon Sep 17 00:00:00 2001 From: gmeficent Date: Mon, 24 Apr 2017 14:04:55 +0200 Subject: [PATCH 1/5] purchase_order_analytic_search --- purchase_order_analytic_search/README.rst | 67 +++++++++++++++++ purchase_order_analytic_search/__init__.py | 5 ++ purchase_order_analytic_search/__openerp__.py | 19 +++++ .../models/__init__.py | 5 ++ .../models/purchase_order.py | 39 ++++++++++ .../tests/__init__.py | 5 ++ .../tests/test_analytic_search.py | 71 +++++++++++++++++++ .../views/purchase_order_view.xml | 67 +++++++++++++++++ 8 files changed, 278 insertions(+) create mode 100644 purchase_order_analytic_search/README.rst create mode 100644 purchase_order_analytic_search/__init__.py create mode 100644 purchase_order_analytic_search/__openerp__.py create mode 100644 purchase_order_analytic_search/models/__init__.py create mode 100644 purchase_order_analytic_search/models/purchase_order.py create mode 100644 purchase_order_analytic_search/tests/__init__.py create mode 100644 purchase_order_analytic_search/tests/test_analytic_search.py create mode 100644 purchase_order_analytic_search/views/purchase_order_view.xml diff --git a/purchase_order_analytic_search/README.rst b/purchase_order_analytic_search/README.rst new file mode 100644 index 00000000000..331e8f7eb00 --- /dev/null +++ b/purchase_order_analytic_search/README.rst @@ -0,0 +1,67 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================== +Purchase Order Analytic Search +============================== + +Organizations often require to quickly find the purchase orders associated to +an analytic account, searching by it's code, name or project/account manager. + +This module introduces the possibility to search purchase orders by analytic +account. + +It also introduces a new menu entry in Purchasing to list purchase order lines. + + +Usage +===== + +To use this module, you need to: + +#. Set 'Analytic Accounting' and 'Analytic Accounting for +Purchases' user rights. + + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/142/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 smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Gisela Mora + + +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_order_analytic_search/__init__.py b/purchase_order_analytic_search/__init__.py new file mode 100644 index 00000000000..3e98fe3d96d --- /dev/null +++ b/purchase_order_analytic_search/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2015-17 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import models \ No newline at end of file diff --git a/purchase_order_analytic_search/__openerp__.py b/purchase_order_analytic_search/__openerp__.py new file mode 100644 index 00000000000..b8d4c6a958d --- /dev/null +++ b/purchase_order_analytic_search/__openerp__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# © 2015-17 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Purchase Order Analytic Search", + "summary": """ + Search purchase orders by analytic account. New menu entry in + Purchasing to list purchase order lines. + """, + "version": "9.0.1.0.0", + "website": "https://odoo-community.org/", + "category": "Purchase Workflow", + "author": "Eficent, Odoo Community Association (OCA)", + "license": "LGPL-3", + "installable": True, + "depends": ["analytic", "purchase"], + "data": ["views/purchase_order_view.xml"], +} diff --git a/purchase_order_analytic_search/models/__init__.py b/purchase_order_analytic_search/models/__init__.py new file mode 100644 index 00000000000..d1b6eef59f6 --- /dev/null +++ b/purchase_order_analytic_search/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2015-17 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import purchase_order diff --git a/purchase_order_analytic_search/models/purchase_order.py b/purchase_order_analytic_search/models/purchase_order.py new file mode 100644 index 00000000000..4c078b503df --- /dev/null +++ b/purchase_order_analytic_search/models/purchase_order.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# © 2015 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from openerp import models, fields, api + + +class PurchaseOrder(models.Model): + + _inherit = "purchase.order" + + @api.multi + @api.depends('order_line.account_analytic_id') + def _get_analytic_accounts(self): + res = {} + for purchase in self: + res[purchase.id] = [] + for po_line in purchase.order_line: + if po_line.account_analytic_id: + res[purchase.id].append(po_line.account_analytic_id.id) + return res + + @api.model + def _search_analytic_accounts(self, operator, value): + po_line_obj = self.env['purchase.order.line'] + res = [] + po_lines = po_line_obj.search( + [('account_analytic_id', operator, value)]) + order_ids = [po_line.order_id and po_line.order_id.id for po_line in + po_lines] + res.append(('id', 'in', order_ids)) + return res + + account_analytic_ids = \ + fields.Many2many(comodel_name='account.analytic.account', + string='Analytic Account', + compute=_get_analytic_accounts, + search=_search_analytic_accounts, + readonly=True) diff --git a/purchase_order_analytic_search/tests/__init__.py b/purchase_order_analytic_search/tests/__init__.py new file mode 100644 index 00000000000..d10845c8c20 --- /dev/null +++ b/purchase_order_analytic_search/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2015-17 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import test_analytic_search \ No newline at end of file diff --git a/purchase_order_analytic_search/tests/test_analytic_search.py b/purchase_order_analytic_search/tests/test_analytic_search.py new file mode 100644 index 00000000000..3a18813cda4 --- /dev/null +++ b/purchase_order_analytic_search/tests/test_analytic_search.py @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- +# © 2015-17 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from openerp.tests import common +from openerp import fields + + +class TestAnalyticSearch(common.TransactionCase): + + def setUp(self): + super(TestAnalyticSearch, self).setUp() + self.purchase_order_model = self.env['purchase.order'] + purchase_order_line_model = self.env['purchase.order.line'] + partner_model = self.env['res.partner'] + prod_model = self.env['product.product'] + analytic_account_model = self.env['account.analytic.account'] + self.product_uom_model = self.env['product.uom'] + + pa_dict = { + 'name': 'Pepito', + 'supplier': True, + } + self.partner = partner_model.sudo().create(pa_dict) + po_dict = { + 'partner_id': self.partner.id, + } + # PURCHASE ORDER NUM 1 + self.purchase_order_1 = self.purchase_order_model.create(po_dict) + uom_id = self.product_uom_model.search([ + ('name', '=', 'Unit(s)')])[0].id + pr_dict = { + 'name': 'Product Test', + 'uom_id': uom_id, + } + self.product = prod_model.sudo().create(pr_dict) + ac_dict = { + 'name': 'analytic account 1', + } + self.analytic_account_1 = \ + analytic_account_model.sudo().create(ac_dict) + pl_dict1 = { + 'date_planned': fields.Datetime.now(), + 'name': 'PO01', + 'order_id': self.purchase_order_1.id, + 'product_id': self.product.id, + 'product_uom': uom_id, + 'price_unit': 1, + 'product_qty': 5.0, + 'account_analytic_id': self.analytic_account_1.id, + } + self.purchase_order_line_1 = \ + purchase_order_line_model.sudo().create(pl_dict1) + + # PURCHASE ORDER NUM 2 + pa_dict2 = { + 'name': 'Juanito', + 'supplier': True, + } + self.partner2 = partner_model.sudo().create(pa_dict2) + po_dict2 = { + 'partner_id': self.partner2.id, + } + self.purchase_order_2 = self.purchase_order_model.create(po_dict2) + + def test_filter_analytic_account(self): + found = self.purchase_order_model.search([ + ('account_analytic_ids', '=', self.analytic_account_1.id)]) + self.assertEqual(found, self.purchase_order_1, + 'Expected %s and got %s' % (self.purchase_order_1, + found)) diff --git a/purchase_order_analytic_search/views/purchase_order_view.xml b/purchase_order_analytic_search/views/purchase_order_view.xml new file mode 100644 index 00000000000..15f6c598edd --- /dev/null +++ b/purchase_order_analytic_search/views/purchase_order_view.xml @@ -0,0 +1,67 @@ + + + +#--------------------------------------------------------------------------------------------------------- +# Add analytic account id to purchase orders +#--------------------------------------------------------------------------------------------------------- + + + purchase.order.list.select + purchase.order + + + + + + + + + + purchase.order.line.tree + purchase.order.line + + + + + + + + + + + purchase.order.line.search + purchase.order.line + + + + + + + + + +#--------------------------------------------------------------------------------------------------------- +# Extend menus +#--------------------------------------------------------------------------------------------------------- + + + Purchase Order Lines + ir.actions.act_window + purchase.order.line + form + tree,form + + + + + tree + + + + + + From 77372758ce8367cadfce9c9f1bb4a7c0604e43ce Mon Sep 17 00:00:00 2001 From: mreficent Date: Fri, 23 Jun 2017 11:35:03 +0200 Subject: [PATCH 2/5] Test --- purchase_order_analytic_search/README.rst | 2 +- .../models/purchase_order.py | 8 +++--- .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/test_analytic_search.py | 27 +++++++++++------- 4 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 purchase_order_analytic_search/static/description/icon.png diff --git a/purchase_order_analytic_search/README.rst b/purchase_order_analytic_search/README.rst index 331e8f7eb00..017d8a0bfa2 100644 --- a/purchase_order_analytic_search/README.rst +++ b/purchase_order_analytic_search/README.rst @@ -33,7 +33,7 @@ Bug Tracker =========== Bugs are tracked on `GitHub Issues -`_. In case of trouble, please +`_. 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. diff --git a/purchase_order_analytic_search/models/purchase_order.py b/purchase_order_analytic_search/models/purchase_order.py index 4c078b503df..fab70e34a85 100644 --- a/purchase_order_analytic_search/models/purchase_order.py +++ b/purchase_order_analytic_search/models/purchase_order.py @@ -2,7 +2,7 @@ # © 2015 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp import models, fields, api +from openerp import api, fields, models class PurchaseOrder(models.Model): @@ -11,7 +11,7 @@ class PurchaseOrder(models.Model): @api.multi @api.depends('order_line.account_analytic_id') - def _get_analytic_accounts(self): + def _compute_analytic_accounts(self): res = {} for purchase in self: res[purchase.id] = [] @@ -34,6 +34,6 @@ def _search_analytic_accounts(self, operator, value): account_analytic_ids = \ fields.Many2many(comodel_name='account.analytic.account', string='Analytic Account', - compute=_get_analytic_accounts, - search=_search_analytic_accounts, + compute='_compute_analytic_accounts', + search='_search_analytic_accounts', readonly=True) diff --git a/purchase_order_analytic_search/static/description/icon.png b/purchase_order_analytic_search/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/purchase_order_analytic_search/tests/test_analytic_search.py b/purchase_order_analytic_search/tests/test_analytic_search.py index 3a18813cda4..2c98198d8ee 100644 --- a/purchase_order_analytic_search/tests/test_analytic_search.py +++ b/purchase_order_analytic_search/tests/test_analytic_search.py @@ -2,11 +2,11 @@ # © 2015-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp.tests import common -from openerp import fields +from openerp.tests.common import TransactionCase +from openerp.fields import Datetime -class TestAnalyticSearch(common.TransactionCase): +class TestAnalyticSearch(TransactionCase): def setUp(self): super(TestAnalyticSearch, self).setUp() @@ -18,7 +18,7 @@ def setUp(self): self.product_uom_model = self.env['product.uom'] pa_dict = { - 'name': 'Pepito', + 'name': 'Partner 1', 'supplier': True, } self.partner = partner_model.sudo().create(pa_dict) @@ -40,7 +40,7 @@ def setUp(self): self.analytic_account_1 = \ analytic_account_model.sudo().create(ac_dict) pl_dict1 = { - 'date_planned': fields.Datetime.now(), + 'date_planned': Datetime.now(), 'name': 'PO01', 'order_id': self.purchase_order_1.id, 'product_id': self.product.id, @@ -54,7 +54,7 @@ def setUp(self): # PURCHASE ORDER NUM 2 pa_dict2 = { - 'name': 'Juanito', + 'name': 'Partner 2', 'supplier': True, } self.partner2 = partner_model.sudo().create(pa_dict2) @@ -63,9 +63,16 @@ def setUp(self): } self.purchase_order_2 = self.purchase_order_model.create(po_dict2) - def test_filter_analytic_account(self): + def test_filter_analytic_accounts(self): found = self.purchase_order_model.search([ ('account_analytic_ids', '=', self.analytic_account_1.id)]) - self.assertEqual(found, self.purchase_order_1, - 'Expected %s and got %s' % (self.purchase_order_1, - found)) + self.assertEqual( + found, self.purchase_order_1, + 'Expected %s and got %s' % (self.purchase_order_1, found)) + + def test_compute_analytic_accounts(self): + self.assertDictContainsSubset( + {self.purchase_order_1.id: [self.analytic_account_1.id]}, + self.purchase_order_1._compute_analytic_accounts(), + 'Method \'_compute_analytic_accounts\' does not work as expected.' + ) From 52ec59eeebf2e7ed161f3016b39973787bd12cfc Mon Sep 17 00:00:00 2001 From: Nikul Chaudhary Date: Thu, 5 Oct 2017 14:51:00 +0530 Subject: [PATCH 3/5] [MIG] purchase_order_analytic_search v10 --- purchase_order_analytic_search/README.rst | 4 +- purchase_order_analytic_search/__init__.py | 4 +- .../__manifest__.py | 22 ++++ purchase_order_analytic_search/__openerp__.py | 19 ---- .../models/__init__.py | 2 +- .../models/purchase_order.py | 17 +-- .../tests/__init__.py | 4 +- .../tests/test_analytic_search.py | 6 +- .../views/purchase_order_view.xml | 103 +++++++++--------- 9 files changed, 93 insertions(+), 88 deletions(-) create mode 100644 purchase_order_analytic_search/__manifest__.py delete mode 100644 purchase_order_analytic_search/__openerp__.py diff --git a/purchase_order_analytic_search/README.rst b/purchase_order_analytic_search/README.rst index 017d8a0bfa2..45b2f50b3f0 100644 --- a/purchase_order_analytic_search/README.rst +++ b/purchase_order_analytic_search/README.rst @@ -26,7 +26,7 @@ Purchases' user rights. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/142/9.0 + :target: https://runbot.odoo-community.org/runbot/142/10.0 Bug Tracker @@ -49,7 +49,7 @@ Contributors ------------ * Gisela Mora - +* Serpent Consulting Services Pvt. Ltd. Maintainer ---------- diff --git a/purchase_order_analytic_search/__init__.py b/purchase_order_analytic_search/__init__.py index 3e98fe3d96d..fe8596a2aaa 100644 --- a/purchase_order_analytic_search/__init__.py +++ b/purchase_order_analytic_search/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2015-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2015-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from . import models \ No newline at end of file +from . import models diff --git a/purchase_order_analytic_search/__manifest__.py b/purchase_order_analytic_search/__manifest__.py new file mode 100644 index 00000000000..4d42bfb22d3 --- /dev/null +++ b/purchase_order_analytic_search/__manifest__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2015-17 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Purchase Order Analytic Search", + "summary": """Search purchase orders by analytic account. New menu entry in + Purchasing to list purchase order lines.""", + "version": "10.0.1.0.0", + "website": "https://odoo-community.org/", + "category": "Purchase Workflow", + "author": "Eficent, Odoo Community Association (OCA)", + "license": "LGPL-3", + "installable": True, + "depends": [ + "analytic", + "purchase" + ], + "data": [ + "views/purchase_order_view.xml" + ], +} diff --git a/purchase_order_analytic_search/__openerp__.py b/purchase_order_analytic_search/__openerp__.py deleted file mode 100644 index b8d4c6a958d..00000000000 --- a/purchase_order_analytic_search/__openerp__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2015-17 Eficent Business and IT Consulting Services S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - -{ - "name": "Purchase Order Analytic Search", - "summary": """ - Search purchase orders by analytic account. New menu entry in - Purchasing to list purchase order lines. - """, - "version": "9.0.1.0.0", - "website": "https://odoo-community.org/", - "category": "Purchase Workflow", - "author": "Eficent, Odoo Community Association (OCA)", - "license": "LGPL-3", - "installable": True, - "depends": ["analytic", "purchase"], - "data": ["views/purchase_order_view.xml"], -} diff --git a/purchase_order_analytic_search/models/__init__.py b/purchase_order_analytic_search/models/__init__.py index d1b6eef59f6..076e65593af 100644 --- a/purchase_order_analytic_search/models/__init__.py +++ b/purchase_order_analytic_search/models/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2015-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2015-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import purchase_order diff --git a/purchase_order_analytic_search/models/purchase_order.py b/purchase_order_analytic_search/models/purchase_order.py index fab70e34a85..20b3973ccb3 100644 --- a/purchase_order_analytic_search/models/purchase_order.py +++ b/purchase_order_analytic_search/models/purchase_order.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# © 2015 Eficent Business and IT Consulting Services S.L. +# Copyright 2015 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp import api, fields, models +from odoo import api, fields, models class PurchaseOrder(models.Model): @@ -31,9 +31,10 @@ def _search_analytic_accounts(self, operator, value): res.append(('id', 'in', order_ids)) return res - account_analytic_ids = \ - fields.Many2many(comodel_name='account.analytic.account', - string='Analytic Account', - compute='_compute_analytic_accounts', - search='_search_analytic_accounts', - readonly=True) + account_analytic_ids = fields.Many2many( + comodel_name='account.analytic.account', + string='Analytic Account', + compute='_compute_analytic_accounts', + search='_search_analytic_accounts', + readonly=True + ) diff --git a/purchase_order_analytic_search/tests/__init__.py b/purchase_order_analytic_search/tests/__init__.py index d10845c8c20..9e998982197 100644 --- a/purchase_order_analytic_search/tests/__init__.py +++ b/purchase_order_analytic_search/tests/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2015-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2015-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from . import test_analytic_search \ No newline at end of file +from . import test_analytic_search diff --git a/purchase_order_analytic_search/tests/test_analytic_search.py b/purchase_order_analytic_search/tests/test_analytic_search.py index 2c98198d8ee..0dad56cc884 100644 --- a/purchase_order_analytic_search/tests/test_analytic_search.py +++ b/purchase_order_analytic_search/tests/test_analytic_search.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# © 2015-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2015-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp.tests.common import TransactionCase -from openerp.fields import Datetime +from odoo.tests.common import TransactionCase +from odoo.fields import Datetime class TestAnalyticSearch(TransactionCase): diff --git a/purchase_order_analytic_search/views/purchase_order_view.xml b/purchase_order_analytic_search/views/purchase_order_view.xml index 15f6c598edd..31de0aba554 100644 --- a/purchase_order_analytic_search/views/purchase_order_view.xml +++ b/purchase_order_analytic_search/views/purchase_order_view.xml @@ -5,63 +5,64 @@ # Add analytic account id to purchase orders #--------------------------------------------------------------------------------------------------------- - - purchase.order.list.select - purchase.order - - - - - - - + + purchase.order.list.select + purchase.order + + + + + + + - - purchase.order.line.tree - purchase.order.line - - - - - - - - - - - purchase.order.line.search - purchase.order.line - - - - - - - + + purchase.order.line.tree + purchase.order.line + + + + + + + + + + purchase.order.line.search + purchase.order.line + + + + + + + #--------------------------------------------------------------------------------------------------------- # Extend menus #--------------------------------------------------------------------------------------------------------- - - Purchase Order Lines - ir.actions.act_window - purchase.order.line - form - tree,form - - - - - tree - - - - + + Purchase Order Lines + ir.actions.act_window + purchase.order.line + form + tree,form + + + + + + tree + + + + + From 20f7c30fbafb93a2690f4186b3c2ad0aff229db1 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 10 Mar 2018 17:52:01 +0100 Subject: [PATCH 4/5] [IMP] purchase_discount: Switch tests to HttpCase + post_install to avoid freezes When performing tests in combination with other tests that prints reports, SavepointCase or TransactionCase tests freeze due to a block in DB. --- .../tests/test_purchase_discount.py | 62 +++++++++++-------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/purchase_discount/tests/test_purchase_discount.py b/purchase_discount/tests/test_purchase_discount.py index 19940f3a398..646ea9509e4 100644 --- a/purchase_discount/tests/test_purchase_discount.py +++ b/purchase_discount/tests/test_purchase_discount.py @@ -1,64 +1,68 @@ # -*- coding: utf-8 -*- # Copyright 2016 ACSONE SA/NV () -# Copyright 2015-2017 Tecnativa - Pedro M. Baeza +# Copyright 2015-2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). import odoo.tests.common as common from odoo import fields -class TestPurchaseOrder(common.SavepointCase): - @classmethod - def setUpClass(cls): - super(TestPurchaseOrder, cls).setUpClass() - cls.product_1 = cls.env['product.product'].create({ +class TestPurchaseOrder(common.HttpCase): + at_install = False + post_install = False + + def setUp(self): + super(TestPurchaseOrder, self).setUp() + self.company = self.env.user.company_id + self.company.tax_calculation_rounding_method = 'round_per_line' + self.product_1 = self.env['product.product'].create({ 'name': 'Test product 1', }) - cls.product_2 = cls.env['product.product'].create({ + self.product_2 = self.env['product.product'].create({ 'name': 'Test product 2', }) - po_model = cls.env['purchase.order.line'] + po_model = self.env['purchase.order.line'] # Make sure currency is EUR for not having troubles with rates - cls.env.user.company_id.currency_id = cls.env.ref('base.EUR') - cls.purchase_order = cls.env['purchase.order'].create({ - 'partner_id': cls.env.ref('base.res_partner_3').id, + self.env.user.company_id.currency_id = self.env.ref('base.EUR') + self.purchase_order = self.env['purchase.order'].create({ + 'partner_id': self.env.ref('base.res_partner_3').id, }) - cls.po_line_1 = po_model.create({ - 'order_id': cls.purchase_order.id, - 'product_id': cls.product_1.id, + self.po_line_1 = po_model.create({ + 'order_id': self.purchase_order.id, + 'product_id': self.product_1.id, 'date_planned': fields.Datetime.now(), 'name': 'Test', 'product_qty': 1.0, - 'product_uom': cls.product_1.uom_id.id, + 'product_uom': self.product_1.uom_id.id, 'discount': 50.0, 'price_unit': 10.0, }) - cls.tax = cls.env['account.tax'].create({ + self.tax = self.env['account.tax'].create({ 'name': 'Sample tax 15%', 'amount_type': 'percent', 'type_tax_use': 'purchase', 'amount': 15.0, }) - cls.po_line_2 = po_model.create({ - 'order_id': cls.purchase_order.id, - 'product_id': cls.product_2.id, + self.po_line_2 = po_model.create({ + 'order_id': self.purchase_order.id, + 'product_id': self.product_2.id, 'date_planned': fields.Datetime.now(), 'name': 'Test', 'product_qty': 10.0, - 'product_uom': cls.product_2.uom_id.id, + 'product_uom': self.product_2.uom_id.id, 'discount': 30, - 'taxes_id': [(6, 0, [cls.tax.id])], + 'taxes_id': [(6, 0, [self.tax.id])], 'price_unit': 230.0, }) - cls.po_line_3 = po_model.create({ - 'order_id': cls.purchase_order.id, - 'product_id': cls.product_2.id, + self.po_line_3 = po_model.create({ + 'order_id': self.purchase_order.id, + 'product_id': self.product_2.id, 'date_planned': fields.Datetime.now(), 'name': 'Test', 'product_qty': 1.0, - 'product_uom': cls.product_2.uom_id.id, + 'product_uom': self.product_2.uom_id.id, 'discount': 0, - 'taxes_id': [(6, 0, [cls.tax.id])], + 'taxes_id': [(6, 0, [self.tax.id])], 'price_unit': 10.0, }) @@ -82,3 +86,9 @@ def test_report_price_unit(self): ]) self.assertEqual(rec.price_total, 5) self.assertEqual(rec.discount, 50) + + +class TestPurchaseOrderRoundGlobally(TestPurchaseOrder): + def setUp(self): + super(TestPurchaseOrderRoundGlobally, self).setUp() + self.company.tax_calculation_rounding_method = 'round_globally' From 68b5a4721dae96e618b50db60f5704d846a0a0a3 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Thu, 15 Mar 2018 09:14:36 +0100 Subject: [PATCH 5/5] [IMP] computed field implementation improve the search method on the field to handle the != operator improve the search method on the field to handle searching on account name --- purchase_order_analytic_search/README.rst | 1 + .../__manifest__.py | 2 +- .../models/purchase_order.py | 39 ++-- .../tests/test_analytic_search.py | 166 +++++++++++++----- 4 files changed, 151 insertions(+), 57 deletions(-) diff --git a/purchase_order_analytic_search/README.rst b/purchase_order_analytic_search/README.rst index 45b2f50b3f0..659089c8a90 100644 --- a/purchase_order_analytic_search/README.rst +++ b/purchase_order_analytic_search/README.rst @@ -50,6 +50,7 @@ Contributors * Gisela Mora * Serpent Consulting Services Pvt. Ltd. +* Alexandre Fayolle Maintainer ---------- diff --git a/purchase_order_analytic_search/__manifest__.py b/purchase_order_analytic_search/__manifest__.py index 4d42bfb22d3..8a7cf9c2f9e 100644 --- a/purchase_order_analytic_search/__manifest__.py +++ b/purchase_order_analytic_search/__manifest__.py @@ -9,7 +9,7 @@ "version": "10.0.1.0.0", "website": "https://odoo-community.org/", "category": "Purchase Workflow", - "author": "Eficent, Odoo Community Association (OCA)", + "author": "Eficent, Camptocamp, Odoo Community Association (OCA)", "license": "LGPL-3", "installable": True, "depends": [ diff --git a/purchase_order_analytic_search/models/purchase_order.py b/purchase_order_analytic_search/models/purchase_order.py index 20b3973ccb3..ff16bcad519 100644 --- a/purchase_order_analytic_search/models/purchase_order.py +++ b/purchase_order_analytic_search/models/purchase_order.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2015 Eficent Business and IT Consulting Services S.L. +# Copyright 2018 Camptocamp # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from odoo import api, fields, models @@ -12,24 +13,36 @@ class PurchaseOrder(models.Model): @api.multi @api.depends('order_line.account_analytic_id') def _compute_analytic_accounts(self): - res = {} for purchase in self: - res[purchase.id] = [] - for po_line in purchase.order_line: - if po_line.account_analytic_id: - res[purchase.id].append(po_line.account_analytic_id.id) - return res + purchase.account_analytic_ids = purchase.mapped( + 'order_line.account_analytic_id' + ) @api.model def _search_analytic_accounts(self, operator, value): po_line_obj = self.env['purchase.order.line'] - res = [] - po_lines = po_line_obj.search( - [('account_analytic_id', operator, value)]) - order_ids = [po_line.order_id and po_line.order_id.id for po_line in - po_lines] - res.append(('id', 'in', order_ids)) - return res + if not value: + return [('id', '=', False)] + if isinstance(value, (tuple, list)): + # we are searching on a list of ids + domain = [('order_id', '!=', False), + ('account_analytic_id', 'in', value)] + else: + if isinstance(value, int): + # we are searching on the id of the analytic_account + domain = [('order_id', '!=', False), + ('account_analytic_id', '=', value)] + else: + # assume we are searching on the analytic account name + domain = [('order_id', '!=', False), + ('account_analytic_id.name', 'like', value), + ] + po_lines = po_line_obj.search(domain) + orders = po_lines.mapped('order_id') + if operator in ('!=', 'not in'): + return [('id', 'not in', orders.ids)] + else: + return [('id', 'in', orders.ids)] account_analytic_ids = fields.Many2many( comodel_name='account.analytic.account', diff --git a/purchase_order_analytic_search/tests/test_analytic_search.py b/purchase_order_analytic_search/tests/test_analytic_search.py index 0dad56cc884..50676a31f61 100644 --- a/purchase_order_analytic_search/tests/test_analytic_search.py +++ b/purchase_order_analytic_search/tests/test_analytic_search.py @@ -1,78 +1,158 @@ # -*- coding: utf-8 -*- # Copyright 2015-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2018 Camptocamp # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from odoo.tests.common import TransactionCase +from odoo.tests.common import SavepointCase from odoo.fields import Datetime -class TestAnalyticSearch(TransactionCase): +class TestAnalyticSearch(SavepointCase): - def setUp(self): - super(TestAnalyticSearch, self).setUp() - self.purchase_order_model = self.env['purchase.order'] - purchase_order_line_model = self.env['purchase.order.line'] - partner_model = self.env['res.partner'] - prod_model = self.env['product.product'] - analytic_account_model = self.env['account.analytic.account'] - self.product_uom_model = self.env['product.uom'] + @classmethod + def setUpClass(cls): + super(TestAnalyticSearch, cls).setUpClass() + cls.purchase_order_model = cls.env['purchase.order'] + partner_model = cls.env['res.partner'] + prod_model = cls.env['product.product'] + analytic_account_model = cls.env['account.analytic.account'] + cls.product_uom_model = cls.env['product.uom'] pa_dict = { 'name': 'Partner 1', 'supplier': True, } - self.partner = partner_model.sudo().create(pa_dict) - po_dict = { - 'partner_id': self.partner.id, - } - # PURCHASE ORDER NUM 1 - self.purchase_order_1 = self.purchase_order_model.create(po_dict) - uom_id = self.product_uom_model.search([ + cls.partner = partner_model.create(pa_dict) + uom_id = cls.product_uom_model.search([ ('name', '=', 'Unit(s)')])[0].id pr_dict = { 'name': 'Product Test', 'uom_id': uom_id, } - self.product = prod_model.sudo().create(pr_dict) + cls.product = prod_model.create(pr_dict) ac_dict = { - 'name': 'analytic account 1', + 'name': 'account 1', } - self.analytic_account_1 = \ - analytic_account_model.sudo().create(ac_dict) - pl_dict1 = { - 'date_planned': Datetime.now(), - 'name': 'PO01', - 'order_id': self.purchase_order_1.id, - 'product_id': self.product.id, - 'product_uom': uom_id, - 'price_unit': 1, - 'product_qty': 5.0, - 'account_analytic_id': self.analytic_account_1.id, + cls.analytic_account_1 = \ + analytic_account_model.create(ac_dict) + ac_dict = { + 'name': 'dummyname', + } + cls.analytic_account_2 = \ + analytic_account_model.create(ac_dict) + # PURCHASE ORDER NUM 1 => account 1 + po_dict = { + 'partner_id': cls.partner.id, + 'order_line': [ + (0, 0, { + 'date_planned': Datetime.now(), + 'name': 'PO01', + 'product_id': cls.product.id, + 'product_uom': uom_id, + 'price_unit': 1, + 'product_qty': 5.0, + 'account_analytic_id': cls.analytic_account_1.id, + }), + (0, 0, { + 'date_planned': Datetime.now(), + 'name': 'PO01', + 'product_id': cls.product.id, + 'product_uom': uom_id, + 'price_unit': 1, + 'product_qty': 5.0, + 'account_analytic_id': cls.analytic_account_1.id, + })], } - self.purchase_order_line_1 = \ - purchase_order_line_model.sudo().create(pl_dict1) + cls.purchase_order_1 = cls.purchase_order_model.create(po_dict) - # PURCHASE ORDER NUM 2 + # PURCHASE ORDER NUM 2 => account 1 and 2 pa_dict2 = { 'name': 'Partner 2', 'supplier': True, } - self.partner2 = partner_model.sudo().create(pa_dict2) + cls.partner2 = partner_model.create(pa_dict2) po_dict2 = { - 'partner_id': self.partner2.id, + 'partner_id': cls.partner2.id, + 'order_line': [ + (0, 0, { + 'date_planned': Datetime.now(), + 'name': 'PO01', + 'product_id': cls.product.id, + 'product_uom': uom_id, + 'price_unit': 1, + 'product_qty': 5.0, + 'account_analytic_id': cls.analytic_account_1.id, + }), + (0, 0, { + 'date_planned': Datetime.now(), + 'name': 'PO01', + 'product_id': cls.product.id, + 'product_uom': uom_id, + 'price_unit': 1, + 'product_qty': 5.0, + 'account_analytic_id': cls.analytic_account_2.id, + }), + ] } - self.purchase_order_2 = self.purchase_order_model.create(po_dict2) + cls.purchase_order_2 = cls.purchase_order_model.create(po_dict2) + # PURCHASE ORDER NUM 3 => account 2 + po_dict3 = { + 'partner_id': cls.partner2.id, + 'order_line': [ + (0, 0, { + 'date_planned': Datetime.now(), + 'name': 'PO01', + 'product_id': cls.product.id, + 'product_uom': uom_id, + 'price_unit': 1, + 'product_qty': 5.0, + 'account_analytic_id': cls.analytic_account_2.id, + }), + (0, 0, { + 'date_planned': Datetime.now(), + 'name': 'PO01', + 'product_id': cls.product.id, + 'product_uom': uom_id, + 'price_unit': 1, + 'product_qty': 5.0, + 'account_analytic_id': cls.analytic_account_2.id, + }), + ] + } + + cls.purchase_order_3 = cls.purchase_order_model.create(po_dict3) def test_filter_analytic_accounts(self): found = self.purchase_order_model.search([ ('account_analytic_ids', '=', self.analytic_account_1.id)]) self.assertEqual( - found, self.purchase_order_1, - 'Expected %s and got %s' % (self.purchase_order_1, found)) + found, + self.purchase_order_1 + self.purchase_order_2 + ) - def test_compute_analytic_accounts(self): - self.assertDictContainsSubset( - {self.purchase_order_1.id: [self.analytic_account_1.id]}, - self.purchase_order_1._compute_analytic_accounts(), - 'Method \'_compute_analytic_accounts\' does not work as expected.' + def test_filter_analytic_accounts_by_name(self): + found = self.purchase_order_model.search([ + ('account_analytic_ids', '=', 'nt 1')]) + self.assertEqual( + found, + self.purchase_order_1 + self.purchase_order_2 + ) + + def test_filter_analytic_accounts_not_equal(self): + found = self.purchase_order_model.search([ + ('account_analytic_ids', '!=', self.analytic_account_1.id)]) + self.assertTrue( + self.purchase_order_3 in found ) + self.assertTrue( + self.purchase_order_1 not in found + ) + self.assertTrue( + self.purchase_order_2 not in found + ) + + def test_compute_analytic_accounts(self): + self.assertEqual(self.purchase_order_1.account_analytic_ids, + self.analytic_account_1) + self.assertEqual(self.purchase_order_2.account_analytic_ids, + self.analytic_account_1 + self.analytic_account_2)