Skip to content

erp5
erp5
Commit 524344aa authored by Nicolas Delaby's avatar Nicolas Delaby
Browse files
Options

Delete my_dialog_mode_listbox_variation_category_list from... 

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
parent 22608c7b
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 145 deletions
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary.xml
View file @ 524344aa
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
<string>my_dialog_mode_total_quantity</string> <string>my_dialog_mode_total_quantity</string>
<string>my_dialog_mode_type</string> <string>my_dialog_mode_type</string>
<string>my_dialog_mode_quantity_unit</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_portal_type</string>
<string>my_dialog_mode_reference</string> <string>my_dialog_mode_reference</string>
<string>my_dialog_mode_title</string> <string>my_dialog_mode_title</string>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/Base_viewTradeFieldLibrary/my_dialog_mode_listbox_variation_category_list.xml deleted 100644 → 0
View file @ 22608c7b
<?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>
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog.xml
View file @ 524344aa
...@@ -92,7 +92,6 @@ ...@@ -92,7 +92,6 @@
<value> <value>
<list> <list>
<string>listbox_quantity</string> <string>listbox_quantity</string>
<string>listbox_variation_category_list</string>
<string>listbox_quantity_unit</string> <string>listbox_quantity_unit</string>
<string>matrixbox_quantity</string> <string>matrixbox_quantity</string>
</list> </list>
...@@ -106,6 +105,7 @@ ...@@ -106,6 +105,7 @@
<string>my_quantity_unit</string> <string>my_quantity_unit</string>
<string>my_total_quantity</string> <string>my_total_quantity</string>
<string>my_simulation_quantity</string> <string>my_simulation_quantity</string>
<string>listbox_variation_category_list</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
View file @ 524344aa
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>default</string>
<string>items</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -50,6 +53,12 @@ ...@@ -50,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -58,6 +67,12 @@ ...@@ -58,6 +67,12 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -69,6 +84,12 @@ ...@@ -69,6 +84,12 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_listbox_variation_category_list</string> </value> <value> <string>my_dialog_mode_listbox_variation_category_list</string> </value>
...@@ -77,6 +98,12 @@ ...@@ -77,6 +98,12 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value> <value> <string>Base_viewTradeFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
...@@ -87,4 +114,30 @@ ...@@ -87,4 +114,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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> </ZopeData>
bt5/erp5_item/bt/revision
View file @ 524344aa
224 226
\ No newline at end of file \ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7