From bf1933dd266874c38893305c1f9f8910a5eb5704 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 4 Sep 2015 16:23:47 +0200 Subject: [PATCH] Add stock_picking_invoice_product_group module --- .../README.rst | 102 ++++++ .../__init__.py | 5 + .../__openerp__.py | 24 ++ .../demo/product.xml | 49 +++ .../i18n/it.po | 72 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 5 + .../tests/test_invoice_product_group.py | 296 ++++++++++++++++++ .../wizards/__init__.py | 5 + .../wizards/stock_invoice_onshipping.py | 58 ++++ .../wizards/stock_invoice_onshipping_view.xml | 20 ++ 11 files changed, 636 insertions(+) create mode 100644 stock_picking_invoice_product_group/README.rst create mode 100644 stock_picking_invoice_product_group/__init__.py create mode 100644 stock_picking_invoice_product_group/__openerp__.py create mode 100644 stock_picking_invoice_product_group/demo/product.xml create mode 100644 stock_picking_invoice_product_group/i18n/it.po create mode 100644 stock_picking_invoice_product_group/static/description/icon.png create mode 100644 stock_picking_invoice_product_group/tests/__init__.py create mode 100644 stock_picking_invoice_product_group/tests/test_invoice_product_group.py create mode 100644 stock_picking_invoice_product_group/wizards/__init__.py create mode 100644 stock_picking_invoice_product_group/wizards/stock_invoice_onshipping.py create mode 100644 stock_picking_invoice_product_group/wizards/stock_invoice_onshipping_view.xml diff --git a/stock_picking_invoice_product_group/README.rst b/stock_picking_invoice_product_group/README.rst new file mode 100644 index 000000000000..cf8a7f38b632 --- /dev/null +++ b/stock_picking_invoice_product_group/README.rst @@ -0,0 +1,102 @@ +.. 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 + +================================================ +Invoices created from picking grouped by product +================================================ + +This module allows you to group invoices generated from pickings by product +or by product category. + +Usage +===== + +This is possible by selecting the related option in the wizard used +for creating draft invoices. + +Example +-------- + +Created the following pickings: + +1. picking_1 - partner_1 + 1. product_A - category_1 + 2. product_B - category_2 +2. picking_2 - partner_2 + 1. product_C - category_2 + 2. product_D - category_3 +3. picking_3 - partner_1 + 1. product_C - category_2 + 2. product_D - category_3 + 3. product_A - category_1 + +Selecting option 'Group by product category' I get the following invoices: + +1. invoice_1 - partner_1 + 1. product_A - category_1 --> picking_1 + 2. product_A - category_1 --> picking_3 +2. invoice_2 - partner_1 + 1. product_B - category_2 --> picking_1 + 2. product_C - category_2 --> picking_3 +3. invoice_3 - partner_1 + 1. product_D - category_3 --> picking_3 +4. invoice_4 - partner_2 + 1. product_C - category_2 --> picking_2 +5. invoice_5 - partner_2 + 1. product_D - category_3 --> picking_2 + +On the contrary if I select option 'Group by product' I get the following +invoices: + +1. invoice_1 - partner_1 + 1. product_A - category_1 --> picking_1 + 2. product_A - category_1 --> picking_3 +2. invoice_2 - partner_1 + 1. product_B - category_2 --> picking_1 +3. invoice_3 - partner_1 + 1. product_C - category_2 --> picking_3 +4. invoice_4 - partner_1 + 1. product_D - category_3 --> picking_3 +5. invoice_5 - partner_2 + 1. product_C - category_2 --> picking_2 +6. invoice_6 - partner_2 + 1. product_D - category_3 --> picking_2 + +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/95/8.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 +======= + +Contributors +------------ + +* Alex Comba + +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 http://odoo-community.org. diff --git a/stock_picking_invoice_product_group/__init__.py b/stock_picking_invoice_product_group/__init__.py new file mode 100644 index 000000000000..9322d3f41dfa --- /dev/null +++ b/stock_picking_invoice_product_group/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Alex Comba - Agile Business Group +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import wizard diff --git a/stock_picking_invoice_product_group/__openerp__.py b/stock_picking_invoice_product_group/__openerp__.py new file mode 100644 index 000000000000..154f23a8ef93 --- /dev/null +++ b/stock_picking_invoice_product_group/__openerp__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Alex Comba - Agile Business Group +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +{ + 'name': 'Stock invoices grouped by product', + 'summary': + 'Invoices created from picking grouped by product or by product category', + 'version': '8.0.1.0.0', + 'category': 'Generic Modules/Accounting', + 'author': "Agile Business Group, Odoo Community Association (OCA)", + 'website': 'http://www.agilebg.com', + 'license': 'AGPL-3', + 'depends': [ + 'stock_picking_invoice_link', + ], + 'data': [ + 'wizards/stock_invoice_onshipping_view.xml', + ], + 'demo': [ + 'demo/product.xml', + ], + 'installable': True, +} diff --git a/stock_picking_invoice_product_group/demo/product.xml b/stock_picking_invoice_product_group/demo/product.xml new file mode 100644 index 000000000000..f48f48a19e19 --- /dev/null +++ b/stock_picking_invoice_product_group/demo/product.xml @@ -0,0 +1,49 @@ + + + + + + + + + + Partner 1 + + + Partner 2 + + + + + + Category 1 + + + Category 2 + + + Category 3 + + + + + + Product A + + + + Product B + + + + Product C + + + + Product D + + + + + diff --git a/stock_picking_invoice_product_group/i18n/it.po b/stock_picking_invoice_product_group/i18n/it.po new file mode 100644 index 000000000000..20f346b18034 --- /dev/null +++ b/stock_picking_invoice_product_group/i18n/it.po @@ -0,0 +1,72 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_picking_invoice_product_group +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-10-03 10:19+0000\n" +"PO-Revision-Date: 2016-10-03 10:19+0000\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_picking_invoice_product_group +#: model:product.category,name:stock_picking_invoice_product_group.category_1 +msgid "Category 1" +msgstr "Category 1" + +#. module: stock_picking_invoice_product_group +#: model:product.category,name:stock_picking_invoice_product_group.category_2 +msgid "Category 2" +msgstr "Category 2" + +#. module: stock_picking_invoice_product_group +#: model:product.category,name:stock_picking_invoice_product_group.category_3 +msgid "Category 3" +msgstr "Category 3" + +#. module: stock_picking_invoice_product_group +#: field:stock.invoice.onshipping,group_type:0 +msgid "Group Type" +msgstr "Tipo Raggruppo" + +#. module: stock_picking_invoice_product_group +#: selection:stock.invoice.onshipping,group_type:0 +msgid "Group by product" +msgstr "Raggruppo per Prodotto" + +#. module: stock_picking_invoice_product_group +#: selection:stock.invoice.onshipping,group_type:0 +msgid "Group by product category" +msgstr "Raggruppo per Categoria" + +#. module: stock_picking_invoice_product_group +#: model:product.template,name:stock_picking_invoice_product_group.product_A_product_template +msgid "Product A" +msgstr "Product A" + +#. module: stock_picking_invoice_product_group +#: model:product.template,name:stock_picking_invoice_product_group.product_B_product_template +msgid "Product B" +msgstr "Product B" + +#. module: stock_picking_invoice_product_group +#: model:product.template,name:stock_picking_invoice_product_group.product_C_product_template +msgid "Product C" +msgstr "Product C" + +#. module: stock_picking_invoice_product_group +#: model:product.template,name:stock_picking_invoice_product_group.product_D_product_template +msgid "Product D" +msgstr "Product D" + +#. module: stock_picking_invoice_product_group +#: model:ir.model,name:stock_picking_invoice_product_group.model_stock_invoice_onshipping +msgid "Stock Invoice Onshipping" +msgstr "Fattura su spedizioni" + diff --git a/stock_picking_invoice_product_group/static/description/icon.png b/stock_picking_invoice_product_group/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_picking_invoice_product_group/tests/__init__.py b/stock_picking_invoice_product_group/tests/__init__.py new file mode 100644 index 000000000000..6b18d00c06cf --- /dev/null +++ b/stock_picking_invoice_product_group/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Alex Comba - Agile Business Group +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import test_invoice_product_group diff --git a/stock_picking_invoice_product_group/tests/test_invoice_product_group.py b/stock_picking_invoice_product_group/tests/test_invoice_product_group.py new file mode 100644 index 000000000000..f214f1cd6ff0 --- /dev/null +++ b/stock_picking_invoice_product_group/tests/test_invoice_product_group.py @@ -0,0 +1,296 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Alex Comba - Agile Business Group +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp.tests.common import TransactionCase + + +class TestInvoiceProductGroup(TransactionCase): + + def transfer_picking(self, picking): + picking.invoice_state = '2binvoiced' + picking.action_confirm() + picking.force_assign() + picking.do_prepare_partial() + picking.do_transfer() + + def setUp(self): + super(TestInvoiceProductGroup, self).setUp() + self.invoice_model = self.env['account.invoice'] + self.picking_model = self.env['stock.picking'] + self.move_model = self.env['stock.move'] + self.onshipping_model = self.env['stock.invoice.onshipping'] + # --------------------------------------------------------------------- + # Get demo data + # --------------------------------------------------------------------- + self.partner_1 = self.env.ref( + 'stock_picking_invoice_product_group.partner_1') + self.partner_2 = self.env.ref( + 'stock_picking_invoice_product_group.partner_2') + self.product_A = self.env.ref( + 'stock_picking_invoice_product_group.product_A') + self.product_B = self.env.ref( + 'stock_picking_invoice_product_group.product_B') + self.product_C = self.env.ref( + 'stock_picking_invoice_product_group.product_C') + self.product_D = self.env.ref( + 'stock_picking_invoice_product_group.product_D') + self.category_1 = self.env.ref( + 'stock_picking_invoice_product_group.category_1') + self.category_2 = self.env.ref( + 'stock_picking_invoice_product_group.category_2') + self.category_3 = self.env.ref( + 'stock_picking_invoice_product_group.category_3') + # --------------------------------------------------------------------- + # Create delivery orders of product A, B, C, D + # --------------------------------------------------------------------- + self.picking_1 = self.picking_model.create({ + 'partner_id': self.partner_1.id, + 'picking_type_id': self.env.ref('stock.picking_type_out').id}) + self.move_model.create({ + 'name': '/', + 'picking_id': self.picking_1.id, + 'product_uom_qty': 2.0, + 'product_id': self.product_A.id, + 'product_uom': self.product_A.uom_id.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': + self.env.ref('stock.stock_location_customers').id, + }) + self.move_model.create({ + 'name': '/', + 'picking_id': self.picking_1.id, + 'product_uom_qty': 2.0, + 'product_id': self.product_B.id, + 'product_uom': self.product_B.uom_id.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': + self.env.ref('stock.stock_location_customers').id, + }) + self.picking_2 = self.picking_model.create({ + 'partner_id': self.partner_2.id, + 'picking_type_id': self.env.ref('stock.picking_type_out').id}) + self.move_model.create({ + 'name': '/', + 'picking_id': self.picking_2.id, + 'product_uom_qty': 2.0, + 'product_id': self.product_C.id, + 'product_uom': self.product_C.uom_id.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': + self.env.ref('stock.stock_location_customers').id, + }) + self.move_model.create({ + 'name': '/', + 'picking_id': self.picking_2.id, + 'product_uom_qty': 2.0, + 'product_id': self.product_D.id, + 'product_uom': self.product_D.uom_id.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': + self.env.ref('stock.stock_location_customers').id, + }) + self.picking_3 = self.picking_model.create({ + 'partner_id': self.partner_1.id, + 'picking_type_id': self.env.ref('stock.picking_type_out').id}) + self.move_model.create({ + 'name': '/', + 'picking_id': self.picking_3.id, + 'product_uom_qty': 2.0, + 'product_id': self.product_C.id, + 'product_uom': self.product_C.uom_id.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': + self.env.ref('stock.stock_location_customers').id, + }) + self.move_model.create({ + 'name': '/', + 'picking_id': self.picking_3.id, + 'product_uom_qty': 2.0, + 'product_id': self.product_D.id, + 'product_uom': self.product_D.uom_id.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': + self.env.ref('stock.stock_location_customers').id, + }) + self.move_model.create({ + 'name': '/', + 'picking_id': self.picking_3.id, + 'product_uom_qty': 2.0, + 'product_id': self.product_A.id, + 'product_uom': self.product_A.uom_id.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': + self.env.ref('stock.stock_location_customers').id, + }) + # --------------------------------------------------------------------- + # Transfer delivery orders + # --------------------------------------------------------------------- + self.transfer_picking(self.picking_1) + self.transfer_picking(self.picking_2) + self.transfer_picking(self.picking_3) + self.picking_ids = [ + self.picking_1.id, self.picking_2.id, self.picking_3.id] + + def test_group_by_default(self): + wizard = self.onshipping_model.with_context( + {'active_ids': self.picking_ids}).create({'group': False}) + invoice_ids = wizard.create_invoice() + invoices = self.env['account.invoice'].browse(invoice_ids) + self.assertEqual(3, len(invoices)) + for invoice in invoices: + self.assertEqual(invoice.type, 'out_invoice') + invoices_1 = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id)]) + self.assertEqual(2, len(invoices_1)) + invoices_2 = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id)]) + self.assertEqual(1, len(invoices_2)) + + def test_group_by_partner(self): + wizard = self.onshipping_model.with_context( + {'active_ids': self.picking_ids}).create({'group': True}) + invoice_ids = wizard.create_invoice() + invoices = self.env['account.invoice'].browse(invoice_ids) + self.assertEqual(2, len(invoices)) + for invoice in invoices: + self.assertEqual(invoice.type, 'out_invoice') + invoices_1 = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id)]) + self.assertEqual(1, len(invoices_1)) + invoices_2 = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id)]) + self.assertEqual(1, len(invoices_2)) + + def test_group_by_category(self): + wizard = self.onshipping_model.with_context( + {'active_ids': self.picking_ids}).create( + {'group_type': 'group_by_product_category'}) + invoice_ids = wizard.create_invoice() + invoices = self.env['account.invoice'].browse(invoice_ids) + self.assertEqual(5, len(invoices)) + for invoice in invoices: + self.assertEqual(invoice.type, 'out_invoice') + # check if each invoice contains product of the same category + categories = invoice.mapped('invoice_line.product_id.categ_id') + self.assertEqual(1, len(categories)) + invoices_1 = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id)]) + self.assertEqual(3, len(invoices_1)) + invoices_2 = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id)]) + self.assertEqual(2, len(invoices_2)) + # --------------------------------------------------------------------- + # Check content of picking_ids on each invoice + # --------------------------------------------------------------------- + inv_1_categ_1 = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id), + ('invoice_line.product_id.categ_id', '=', self.category_1.id), + ]) + self.assertEqual(1, len(inv_1_categ_1)) + self.assertEqual(2, len(inv_1_categ_1.picking_ids)) + self.assertTrue(self.picking_1 in inv_1_categ_1.picking_ids) + self.assertTrue(self.picking_3 in inv_1_categ_1.picking_ids) + # --------------------------------------------------------------------- + inv_1_categ_2 = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id), + ('invoice_line.product_id.categ_id', '=', self.category_2.id), + ]) + self.assertEqual(1, len(inv_1_categ_2)) + self.assertEqual(2, len(inv_1_categ_2.picking_ids)) + self.assertTrue(self.picking_1 in inv_1_categ_2.picking_ids) + self.assertTrue(self.picking_3 in inv_1_categ_2.picking_ids) + # --------------------------------------------------------------------- + inv_1_categ_3 = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id), + ('invoice_line.product_id.categ_id', '=', self.category_3.id), + ]) + self.assertEqual(1, len(inv_1_categ_3)) + self.assertEqual(1, len(inv_1_categ_3.picking_ids)) + self.assertTrue(self.picking_3 in inv_1_categ_3.picking_ids) + # --------------------------------------------------------------------- + inv_2_categ_2 = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id), + ('invoice_line.product_id.categ_id', '=', self.category_2.id), + ]) + self.assertEqual(1, len(inv_2_categ_2)) + self.assertEqual(1, len(inv_2_categ_2.picking_ids)) + self.assertTrue(self.picking_2 in inv_2_categ_2.picking_ids) + # --------------------------------------------------------------------- + inv_2_categ_3 = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id), + ('invoice_line.product_id.categ_id', '=', self.category_3.id), + ]) + self.assertEqual(1, len(inv_2_categ_3)) + self.assertEqual(1, len(inv_2_categ_3.picking_ids)) + self.assertTrue(self.picking_2 in inv_2_categ_3.picking_ids) + + def test_group_by_product(self): + wizard = self.onshipping_model.with_context( + {'active_ids': self.picking_ids}).create( + {'group_type': 'group_by_product'}) + invoice_ids = wizard.create_invoice() + invoices = self.env['account.invoice'].browse(invoice_ids) + self.assertEqual(6, len(invoices)) + for invoice in invoices: + self.assertEqual(invoice.type, 'out_invoice') + # check if each invoice contains same product + products = invoice.mapped('invoice_line.product_id') + self.assertEqual(1, len(products)) + invoices_1 = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id)]) + self.assertEqual(4, len(invoices_1)) + invoices_2 = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id)]) + self.assertEqual(2, len(invoices_2)) + # --------------------------------------------------------------------- + # Check content of picking_ids on each invoice + # --------------------------------------------------------------------- + inv_1_prod_A = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id), + ('invoice_line.product_id', '=', self.product_A.id), + ]) + self.assertEqual(1, len(inv_1_prod_A)) + self.assertEqual(2, len(inv_1_prod_A.picking_ids)) + self.assertTrue(self.picking_1 in inv_1_prod_A.picking_ids) + self.assertTrue(self.picking_3 in inv_1_prod_A.picking_ids) + # --------------------------------------------------------------------- + inv_1_prod_B = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id), + ('invoice_line.product_id', '=', self.product_B.id), + ]) + self.assertEqual(1, len(inv_1_prod_B)) + self.assertEqual(1, len(inv_1_prod_B.picking_ids)) + self.assertTrue(self.picking_1 in inv_1_prod_B.picking_ids) + # --------------------------------------------------------------------- + inv_1_prod_C = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id), + ('invoice_line.product_id', '=', self.product_C.id), + ]) + self.assertEqual(1, len(inv_1_prod_C)) + self.assertEqual(1, len(inv_1_prod_C.picking_ids)) + self.assertTrue(self.picking_3 in inv_1_prod_C.picking_ids) + # --------------------------------------------------------------------- + inv_1_prod_D = self.invoice_model.search( + [('partner_id', '=', self.partner_1.id), + ('invoice_line.product_id', '=', self.product_D.id), + ]) + self.assertEqual(1, len(inv_1_prod_D)) + self.assertEqual(1, len(inv_1_prod_D.picking_ids)) + self.assertTrue(self.picking_3 in inv_1_prod_D.picking_ids) + # --------------------------------------------------------------------- + inv_2_prod_C = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id), + ('invoice_line.product_id', '=', self.product_C.id), + ]) + self.assertEqual(1, len(inv_2_prod_C)) + self.assertEqual(1, len(inv_2_prod_C.picking_ids)) + self.assertTrue(self.picking_2 in inv_2_prod_C.picking_ids) + # --------------------------------------------------------------------- + inv_2_prod_D = self.invoice_model.search( + [('partner_id', '=', self.partner_2.id), + ('invoice_line.product_id', '=', self.product_D.id), + ]) + self.assertEqual(1, len(inv_2_prod_D)) + self.assertEqual(1, len(inv_2_prod_D.picking_ids)) + self.assertTrue(self.picking_2 in inv_2_prod_D.picking_ids) diff --git a/stock_picking_invoice_product_group/wizards/__init__.py b/stock_picking_invoice_product_group/wizards/__init__.py new file mode 100644 index 000000000000..8d4f5bce7c2e --- /dev/null +++ b/stock_picking_invoice_product_group/wizards/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Alex Comba - Agile Business Group +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import stock_invoice_onshipping diff --git a/stock_picking_invoice_product_group/wizards/stock_invoice_onshipping.py b/stock_picking_invoice_product_group/wizards/stock_invoice_onshipping.py new file mode 100644 index 000000000000..58f1e1578c9c --- /dev/null +++ b/stock_picking_invoice_product_group/wizards/stock_invoice_onshipping.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Alex Comba - Agile Business Group +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp import models, api, fields + + +class StockInvoiceOnshipping(models.TransientModel): + _inherit = 'stock.invoice.onshipping' + + group_type = fields.Selection( + [('group_by_product', 'Group by product'), + ('group_by_product_category', 'Group by product category') + ], + string='Group Type', + ) + + @api.model + def _group_moves_by_group_type(self, moves, group_type): + """Return moves grouped by group_type""" + grouped_moves = {} + for move in moves: + partner = move.picking_id.partner_id + product = move.product_id + categ = product.categ_id + if group_type == 'group_by_product': + key = (partner.id, product.id) + else: + key = (partner.id, categ.id) + if key not in grouped_moves: + grouped_moves[key] = [] + grouped_moves[key].append(move) + return grouped_moves + + @api.multi + def create_invoice(self): + if self.group_type: + journal2type = { + 'sale': 'out_invoice', + 'purchase': 'in_invoice', + 'sale_refund': 'out_refund', + 'purchase_refund': 'in_refund'} + inv_type = journal2type.get(self.journal_type) or 'out_invoice' + picking_ids = self.env.context['active_ids'] + picking_model = self.env['stock.picking'] + pickings = picking_model.browse(picking_ids) + moves = pickings.mapped('move_lines') + invoices = [] + moves_by_group_type = self._group_moves_by_group_type( + moves, self.group_type) + for moves in moves_by_group_type.values(): + invoices += picking_model.with_context( + date_inv=self.invoice_date, + inv_type=inv_type)._invoice_create_line( + moves, self.journal_id.id, inv_type) + return invoices + else: + return super(StockInvoiceOnshipping, self).create_invoice() diff --git a/stock_picking_invoice_product_group/wizards/stock_invoice_onshipping_view.xml b/stock_picking_invoice_product_group/wizards/stock_invoice_onshipping_view.xml new file mode 100644 index 000000000000..a799f01f186f --- /dev/null +++ b/stock_picking_invoice_product_group/wizards/stock_invoice_onshipping_view.xml @@ -0,0 +1,20 @@ + + + + + + + + view_stock_invoice_onshipping + stock.invoice.onshipping + + + + + + + + + +