Commit 803f5950 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

now payment condition is copied to packing list.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33386 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 24f2f218
...@@ -2542,9 +2542,8 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase): ...@@ -2542,9 +2542,8 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.assertEquals(10 + 20, order.getTotalQuantity()) self.assertEquals(10 + 20, order.getTotalQuantity())
self.assertEquals(10*4 + 20*5, order.getTotalPrice()) self.assertEquals(10*4 + 20*5, order.getTotalPrice())
def test_order_payment_condition_not_copied(self): def test_order_payment_condition_copied(self):
# Payment Condition no longer exist in packing list, so they should not be # Payment Condition should be copied in the packing list
# copied in the packing list
resource = self.portal.getDefaultModule( resource = self.portal.getDefaultModule(
self.resource_portal_type).newContent( self.resource_portal_type).newContent(
portal_type=self.resource_portal_type, portal_type=self.resource_portal_type,
...@@ -2575,7 +2574,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase): ...@@ -2575,7 +2574,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
related_packing_list = order.getCausalityRelatedValue( related_packing_list = order.getCausalityRelatedValue(
portal_type=self.packing_list_portal_type) portal_type=self.packing_list_portal_type)
self.assertNotEquals(related_packing_list, None) self.assertNotEquals(related_packing_list, None)
self.assertEquals(0, len(related_packing_list.contentValues( self.assertEquals(1, len(related_packing_list.contentValues(
portal_type='Payment Condition'))) portal_type='Payment Condition')))
def test_Order_viewAsODT(self): def test_Order_viewAsODT(self):
......
...@@ -2540,9 +2540,8 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase): ...@@ -2540,9 +2540,8 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.assertEquals(10 + 20, order.getTotalQuantity()) self.assertEquals(10 + 20, order.getTotalQuantity())
self.assertEquals(10*4 + 20*5, order.getTotalPrice()) self.assertEquals(10*4 + 20*5, order.getTotalPrice())
def test_order_payment_condition_not_copied(self): def test_order_payment_condition_copied(self):
# Payment Condition no longer exist in packing list, so they should not be # Payment Condition should be copied in the packing list
# copied in the packing list
resource = self.portal.getDefaultModule( resource = self.portal.getDefaultModule(
self.resource_portal_type).newContent( self.resource_portal_type).newContent(
portal_type=self.resource_portal_type, portal_type=self.resource_portal_type,
...@@ -2573,7 +2572,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase): ...@@ -2573,7 +2572,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
related_packing_list = order.getCausalityRelatedValue( related_packing_list = order.getCausalityRelatedValue(
portal_type=self.packing_list_portal_type) portal_type=self.packing_list_portal_type)
self.assertNotEquals(related_packing_list, None) self.assertNotEquals(related_packing_list, None)
self.assertEquals(0, len(related_packing_list.contentValues( self.assertEquals(1, len(related_packing_list.contentValues(
portal_type='Payment Condition'))) portal_type='Payment Condition')))
def test_Order_viewAsODT(self): def test_Order_viewAsODT(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment