From e6e7d78280ab152564f248b5831f6f9b4627a95e Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 31 Aug 2016 14:28:15 +0200 Subject: [PATCH] Fixes as a result of changes of stock_picking_invoice_link See https://github.com/OCA/stock-logistics-workflow/commit/9c1d0756e410559227d7635afefc8b9b29d1ae97 for futher info --- .../__openerp__.py | 1 - .../models/__init__.py | 2 - .../models/account_invoice.py | 21 -------- .../models/stock_picking.py | 20 ------- .../tests/test_invoice_product_group.py | 54 +++++++++---------- .../views/account_invoice_view.xml | 19 ------- 6 files changed, 27 insertions(+), 90 deletions(-) delete mode 100644 stock_picking_invoice_product_group/models/account_invoice.py delete mode 100644 stock_picking_invoice_product_group/models/stock_picking.py delete mode 100644 stock_picking_invoice_product_group/views/account_invoice_view.xml diff --git a/stock_picking_invoice_product_group/__openerp__.py b/stock_picking_invoice_product_group/__openerp__.py index 541ea42a85ea..576771be9cc7 100644 --- a/stock_picking_invoice_product_group/__openerp__.py +++ b/stock_picking_invoice_product_group/__openerp__.py @@ -15,7 +15,6 @@ 'stock_picking_invoice_link', ], 'data': [ - 'views/account_invoice_view.xml', 'wizard/stock_invoice_onshipping_view.xml', ], 'demo': [ diff --git a/stock_picking_invoice_product_group/models/__init__.py b/stock_picking_invoice_product_group/models/__init__.py index 7ee5283fa0fb..90cd2440102b 100644 --- a/stock_picking_invoice_product_group/models/__init__.py +++ b/stock_picking_invoice_product_group/models/__init__.py @@ -2,6 +2,4 @@ # (c) 2015 Alex Comba - Agile Business Group # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from . import account_invoice from . import stock_move -from . import stock_picking diff --git a/stock_picking_invoice_product_group/models/account_invoice.py b/stock_picking_invoice_product_group/models/account_invoice.py deleted file mode 100644 index ed3d82f46e88..000000000000 --- a/stock_picking_invoice_product_group/models/account_invoice.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- 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 import models, fields - - -class AccountInvoice(models.Model): - _inherit = 'account.invoice' - - related_picking_ids = fields.Many2many( - comodel_name='stock.picking', - relation='account_invoice_stock_picking_rel', - column1='account_invoice_id', - column2='stock_picking_id', - string='Related Pickings', - readonly=True, - copy=False, - help='Related pickings ' - '(only when the invoice has been generated from the picking).' - ) diff --git a/stock_picking_invoice_product_group/models/stock_picking.py b/stock_picking_invoice_product_group/models/stock_picking.py deleted file mode 100644 index 66f990399ad9..000000000000 --- a/stock_picking_invoice_product_group/models/stock_picking.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- 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 import models, api - - -class StockPicking(models.Model): - _inherit = 'stock.picking' - - @api.model - def _invoice_create_line(self, moves, journal_id, inv_type='out_invoice'): - invoice_ids = super(StockPicking, self)._invoice_create_line( - moves, journal_id, inv_type=inv_type) - for invoice_id in invoice_ids: - pickings = self.env['stock.picking'].search( - [('invoice_id', '=', invoice_id)]) - invoice = self.env['account.invoice'].browse(invoice_id) - invoice.related_picking_ids = [(6, 0, pickings.ids)] - return invoice_ids 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 index f046cf86f10c..f214f1cd6ff0 100644 --- a/stock_picking_invoice_product_group/tests/test_invoice_product_group.py +++ b/stock_picking_invoice_product_group/tests/test_invoice_product_group.py @@ -181,49 +181,49 @@ def test_group_by_category(self): [('partner_id', '=', self.partner_2.id)]) self.assertEqual(2, len(invoices_2)) # --------------------------------------------------------------------- - # Check content of related_picking_ids on each invoice + # 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.related_picking_ids)) - self.assertTrue(self.picking_1 in inv_1_categ_1.related_picking_ids) - self.assertTrue(self.picking_3 in inv_1_categ_1.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_1 in inv_1_categ_2.related_picking_ids) - self.assertTrue(self.picking_3 in inv_1_categ_2.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_3 in inv_1_categ_3.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_2 in inv_2_categ_2.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_2 in inv_2_categ_3.related_picking_ids) + 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( @@ -244,53 +244,53 @@ def test_group_by_product(self): [('partner_id', '=', self.partner_2.id)]) self.assertEqual(2, len(invoices_2)) # --------------------------------------------------------------------- - # Check content of related_picking_ids on each invoice + # 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.related_picking_ids)) - self.assertTrue(self.picking_1 in inv_1_prod_A.related_picking_ids) - self.assertTrue(self.picking_3 in inv_1_prod_A.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_1 in inv_1_prod_B.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_3 in inv_1_prod_C.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_3 in inv_1_prod_D.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_2 in inv_2_prod_C.related_picking_ids) + 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.related_picking_ids)) - self.assertTrue(self.picking_2 in inv_2_prod_D.related_picking_ids) + 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/views/account_invoice_view.xml b/stock_picking_invoice_product_group/views/account_invoice_view.xml deleted file mode 100644 index 20a683368b9e..000000000000 --- a/stock_picking_invoice_product_group/views/account_invoice_view.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - related.pickings.account.invoice.form - account.invoice - - - - 1 - - - - - - - -