2008-10-29 mame

* movement groups used to copy delivery_mode and incoterm on packing_list

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24391 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml

@@ -34,7 +34,12 @@
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>delivery</string>
+                <string>order</string>
+                <string>parent</string>
+                <string>resource</string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -53,7 +58,7 @@
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: []</string> </value>
+            <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalResourceTypeList())</string> </value>
         </item>
         <item>
             <key> <string>acquisition_sync_value</string> </key>
@@ -81,7 +86,9 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
@@ -107,7 +114,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
+            <value> <string>3</string> </value>
         </item>
         <item>
             <key> <string>membership_criterion_base_category</string> </key>

bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml

@@ -34,7 +34,12 @@
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>delivery</string>
+                <string>order</string>
+                <string>parent</string>
+                <string>resource</string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -53,7 +58,7 @@
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: []</string> </value>
+            <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalResourceTypeList())</string> </value>
         </item>
         <item>
             <key> <string>acquisition_sync_value</string> </key>
@@ -89,7 +94,9 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
@@ -115,7 +122,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
+            <value> <string>4</string> </value>
         </item>
         <item>
             <key> <string>membership_criterion_base_category</string> </key>

bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml

@@ -40,6 +40,8 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
+                <string>delivery_mode</string>
+                <string>incoterm</string>
                 <string>source</string>
                 <string>destination</string>
                 <string>source_section</string>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml

@@ -59,13 +59,7 @@ related_order = packing_list.getCausalityValue()\n
 if packing_list.getSimulationState() == \'draft\':\n
   packing_list.edit(\n
     comment = related_order.getComment(),\n
-    title = related_order.getTitle(),\n
-\n
-   # TODO: use movement group instead of copying those categories:\n
-    delivery_mode = related_order.getDeliveryMode(),\n
-    incoterm = related_order.getIncoterm(),\n
-    source_administration_value = related_order.getSourceAdministrationValue(),\n
-\n
+    title = related_order.getTitle()\n
   )\n
 </string> </value>
         </item>

bt5/erp5_trade/bt/revision

-520
+521
\ No newline at end of file