Skip to content

Commit

Permalink
Fixes as a result of changes of stock_picking_invoice_link
Browse files Browse the repository at this point in the history 
See OCA/stock-logistics-workflow@9c1d075 for futher info
  • Loading branch information
@tafaRU
tafaRU committed Aug 31, 2016
1 parent 7e28fb5 commit e6e7d78
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 90 deletions.
1 change: 0 additions & 1 deletion stock_picking_invoice_product_group/__openerp__.py
View file
Expand Up @@ -15,7 +15,6 @@
'stock_picking_invoice_link',
],
'data': [
'views/account_invoice_view.xml',
'wizard/stock_invoice_onshipping_view.xml',
],
'demo': [
Expand Down
2 changes: 0 additions & 2 deletions stock_picking_invoice_product_group/models/__init__.py
View file
Expand Up @@ -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
21 changes: 0 additions & 21 deletions stock_picking_invoice_product_group/models/account_invoice.py
View file

This file was deleted.

20 changes: 0 additions & 20 deletions stock_picking_invoice_product_group/models/stock_picking.py
View file

This file was deleted.

54 changes: 27 additions & 27 deletions stock_picking_invoice_product_group/tests/test_invoice_product_group.py
View file
Expand Up @@ -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(
Expand All @@ -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)
19 changes: 0 additions & 19 deletions stock_picking_invoice_product_group/views/account_invoice_view.xml
View file

This file was deleted.

0 comments on commit e6e7d78

Please sign in to comment.