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

bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml

@@ -28,7 +28,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml

@@ -10,7 +10,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml

@@ -10,7 +10,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml

@@ -28,7 +28,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml

@@ -15,7 +15,6 @@
             <value>
               <tuple>
                 <string>specialise</string>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
                 <string>resource</string>
               </tuple>

bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
                 <string>resource</string>
               </tuple>

product/CMFCategory/tests/testCMFCategory.py

@@ -762,12 +762,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."""

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_carrier_administration.xml

@@ -61,7 +61,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision_administration.xml

@@ -61,7 +61,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_funding.xml

@@ -79,7 +79,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment_request.xml

@@ -79,7 +79,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section_administration.xml

@@ -61,7 +61,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml

@@ -78,7 +78,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml

@@ -79,7 +79,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_account.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_advice.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_carrier_administration.xml

@@ -61,7 +61,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision_administration.xml

@@ -61,7 +61,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_funding.xml

@@ -79,7 +79,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml

@@ -14,7 +14,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment_request.xml

@@ -79,7 +79,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml

@@ -79,7 +79,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section_administration.xml

@@ -61,7 +61,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml

@@ -32,7 +32,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/efficiency_property.xml

@@ -40,9 +40,7 @@
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
-              <tuple>
-                <string>delivery</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/quantity_property.xml

@@ -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>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/InventoryMovement/inventory_property.xml

@@ -40,9 +40,7 @@
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
-              <tuple>
-                <string>delivery</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Movement/frozen_property.xml

@@ -41,7 +41,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>delivery</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/base_unit_price_property.xml

@@ -42,8 +42,6 @@
             <value>
               <tuple>
                 <string>parent</string>
-                <string>order</string>
-                <string>delivery</string>
               </tuple>
             </value>
         </item>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/price_property.xml

@@ -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>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/start_date_property.xml

@@ -41,8 +41,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>delivery</string>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/stop_date_property.xml

@@ -41,8 +41,6 @@
             <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple>
-                <string>delivery</string>
-                <string>order</string>
                 <string>parent</string>
               </tuple>
             </value>