Commit 881fad5b authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

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

parent 70a5a681
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<value> <value>
<tuple> <tuple>
<string>specialise</string> <string>specialise</string>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
<string>resource</string> <string>resource</string>
</tuple> </tuple>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
<string>resource</string> <string>resource</string>
</tuple> </tuple>
......
...@@ -762,12 +762,22 @@ class TestCMFCategory(ERP5TypeTestCase): ...@@ -762,12 +762,22 @@ class TestCMFCategory(ERP5TypeTestCase):
order.setDestinationAdministrationValue(person) order.setDestinationAdministrationValue(person)
self.assertEqual(order.getDestinationAdministrationPersonTitle(), 'toto') self.assertEqual(order.getDestinationAdministrationPersonTitle(), 'toto')
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.setDestinationAdministrationValue(None) packing_list.setDestinationAdministrationValue(None)
packing_list.setOrderValue(None) packing_list.setOrderValue(None)
self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), None) self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), None)
packing_list.setOrderValue(order) packing_list.setOrderValue(order)
self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), 'toto') self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), 'toto')
finally:
category.setAcquisitionBaseCategoryList(original_acquisition_base_category_list)
def test_22_UserFriendlyException(self): def test_22_UserFriendlyException(self):
"""Test message raise if bad use of setter.""" """Test message raise if bad use of setter."""
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -40,9 +40,7 @@ ...@@ -40,9 +40,7 @@
<item> <item>
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple/>
<string>delivery</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -40,10 +40,7 @@ ...@@ -40,10 +40,7 @@
<item> <item>
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple/>
<string>order</string>
<string>delivery</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -40,9 +40,7 @@ ...@@ -40,9 +40,7 @@
<item> <item>
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple/>
<string>delivery</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>delivery</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -42,8 +42,6 @@ ...@@ -42,8 +42,6 @@
<value> <value>
<tuple> <tuple>
<string>parent</string> <string>parent</string>
<string>order</string>
<string>delivery</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -40,10 +40,7 @@ ...@@ -40,10 +40,7 @@
<item> <item>
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple/>
<string>order</string>
<string>delivery</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </value>
......
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
<key> <string>acquisition_base_category</string> </key> <key> <string>acquisition_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string> <string>parent</string>
</tuple> </tuple>
</value> </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