Commit 2e627683 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Julien Muchembled

we no longer use order/delivery category to acquire categories and properties.

parent 3bdde386
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -28,7 +28,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -10,7 +10,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -10,7 +10,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -28,7 +28,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -15,7 +15,6 @@
<value>
<tuple>
<string>specialise</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
<string>resource</string>
</tuple>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
<string>resource</string>
</tuple>
......
......@@ -772,12 +772,22 @@ class TestCMFCategory(ERP5TypeTestCase):
order.setDestinationAdministrationValue(person)
self.assertEqual(order.getDestinationAdministrationPersonTitle(), 'toto')
packing_list.setDestinationAdministrationValue(None)
packing_list.setOrderValue(None)
self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), None)
try:
category = self.portal.portal_categories.destination_administration
original_acquisition_base_category_list = category.getAcquisitionBaseCategoryList()
category.setAcquisitionBaseCategoryList(['parent', 'order'])
line = order.newContent(portal_type='Sale Order Line')
self.assertEqual(line.getDestinationAdministrationPersonTitle(), 'toto')
packing_list.setOrderValue(order)
self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), 'toto')
packing_list.setDestinationAdministrationValue(None)
packing_list.setOrderValue(None)
self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), None)
packing_list.setOrderValue(order)
self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), 'toto')
finally:
category.setAcquisitionBaseCategoryList(original_acquisition_base_category_list)
def test_22_UserFriendlyException(self):
"""Test message raise if bad use of setter."""
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -78,7 +78,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -40,9 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
......@@ -40,10 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
......@@ -40,9 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
......@@ -41,7 +41,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -42,8 +42,6 @@
<value>
<tuple>
<string>parent</string>
<string>order</string>
<string>delivery</string>
</tuple>
</value>
</item>
......
......@@ -40,10 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
......@@ -41,8 +41,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
......@@ -41,8 +41,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
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