From 0d8335267c2123f0c0a1aa82eeda0dd517f40dac Mon Sep 17 00:00:00 2001
From: Mame Coumba Sall <mame@nexedi.com>
Date: Wed, 29 Oct 2008 15:11:42 +0000
Subject: [PATCH] 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
---
.../portal_categories/delivery_mode.xml | 15 +++++++++++----
.../portal_categories/incoterm.xml | 15 +++++++++++----
.../category_movement_group_on_delivery.xml | 2 ++
.../PackingList_copyOrderProperties.xml | 8 +-------
bt5/erp5_trade/bt/revision | 2 +-
5 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
index 9b6c354e47..54d587be73 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
+++ b/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>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
index ebc1a83ee7..d8037d89b9 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
+++ b/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>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml b/bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
index 90a4f2cb43..b638e074fb 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
+++ b/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>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
index 8438a0edd8..48aa69a9c7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
+++ b/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>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index e157b5b5f3..7c2b018235 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-520
\ No newline at end of file
+521
\ No newline at end of file
--
GitLab