From 524344aa21d64ee697506a89784e7af78806fb66 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Fri, 5 Nov 2010 15:34:53 +0000
Subject: [PATCH] Delete my_dialog_mode_listbox_variation_category_list from
erp5_item_trade/Base_viewTradeFieldLibrary because it was overloading
Proxyfield in erp5_trade/Base_viewTradeFieldLibrary with wrong Tales
Expression
The purpose of erp5_item_trade/Base_viewTradeFieldLibrary is only to carry new Fields which are not in
erp5_trade/Base_viewTradeFieldLibrary.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39968 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../Base_viewTradeFieldLibrary.xml | 1 -
...g_mode_listbox_variation_category_list.xml | 141 ------------------
.../DeliveryLine_viewSelectItemListDialog.xml | 2 +-
.../listbox_variation_category_list.xml | 55 ++++++-
bt5/erp5_item/bt/revision | 2 +-
5 files changed, 56 insertions(+), 145 deletions(-)
delete mode 100644 bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary/my_dialog_mode_listbox_variation_category_list.xml
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary.xml
index e1746be088..2f8414dcfc 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary.xml
@@ -101,7 +101,6 @@
<string>my_dialog_mode_total_quantity</string>
<string>my_dialog_mode_type</string>
<string>my_dialog_mode_quantity_unit</string>
- <string>my_dialog_mode_listbox_variation_category_list</string>
<string>my_dialog_mode_portal_type</string>
<string>my_dialog_mode_reference</string>
<string>my_dialog_mode_title</string>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary/my_dialog_mode_listbox_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary/my_dialog_mode_listbox_variation_category_list.xml
deleted file mode 100644
index 957e4f3a65..0000000000
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary/my_dialog_mode_listbox_variation_category_list.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list>
- <string>size</string>
- <string>title</string>
- <string>default</string>
- <string>items</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_dialog_mode_listbox_variation_category_list</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_multi_list_field</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <int>5</int> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Variation</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>cell/Item_getVariationCategoryList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>cell/Item_getVariationRangeCategoryItemList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog.xml
index fd49d73e30..797528fc9b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog.xml
@@ -92,7 +92,6 @@
<value>
<list>
<string>listbox_quantity</string>
- <string>listbox_variation_category_list</string>
<string>listbox_quantity_unit</string>
<string>matrixbox_quantity</string>
</list>
@@ -106,6 +105,7 @@
<string>my_quantity_unit</string>
<string>my_total_quantity</string>
<string>my_simulation_quantity</string>
+ <string>listbox_variation_category_list</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
index c650990066..439b7117a6 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
@@ -9,7 +9,10 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>default</string>
+ <string>items</string>
+ </list>
</value>
</item>
<item>
@@ -50,6 +53,12 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -58,6 +67,12 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
@@ -69,6 +84,12 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_listbox_variation_category_list</string> </value>
@@ -77,6 +98,12 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
@@ -87,4 +114,30 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>cell/Item_getVariationCategoryList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>cell/Item_getVariationRangeCategoryItemList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision
index fba8ce006f..0e4c1b3f90 100644
--- a/bt5/erp5_item/bt/revision
+++ b/bt5/erp5_item/bt/revision
@@ -1 +1 @@
-224
\ No newline at end of file
+226
\ No newline at end of file
--
2.30.9