From 85e12f079ec84ae4fbd10bf827473b0d92cea9f4 Mon Sep 17 00:00:00 2001 From: Mame Coumba Sall <mame@nexedi.com> Date: Wed, 27 May 2009 10:15:56 +0000 Subject: [PATCH] 2009-05-27 mame *unproxify variation_category_list *removes tales expression in quantity_unit field to display quantity_unit even when line has variation git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27210 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../my_variation_category_list.xml | 218 +++++++++++++++--- .../listbox_quantity_unit.xml | 40 ++-- bt5/erp5_trade/bt/revision | 2 +- 3 files changed, 210 insertions(+), 50 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_variation_category_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_variation_category_list.xml index 81da0e93f8..e7a123ae4e 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_variation_category_list.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_variation_category_list.xml @@ -3,24 +3,12 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/> <tuple/> </tuple> </pickle> <pickle> <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list> - <string>hash_script_id</string> - <string>title</string> - <string>required</string> - <string>size</string> - <string>items</string> - </list> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_variation_category_list</string> </value> @@ -33,6 +21,14 @@ <key> <string>external_validator_failed</string> </key> <value> <string>The input failed the external validator.</string> </value> </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>unknown_selection</string> </key> + <value> <string>You selected an item that was not in the list.</string> </value> + </item> </dictionary> </value> </item> @@ -41,15 +37,75 @@ <value> <dictionary> <item> - <key> <string>field_id</string> </key> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hash_script_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> + <key> <string>unicode</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>target</string> </key> + <key> <string>view_separator</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -60,11 +116,51 @@ <value> <dictionary> <item> - <key> <string>field_id</string> </key> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hash_script_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> <value> <string></string> </value> </item> <item> @@ -74,7 +170,23 @@ </value> </item> <item> - <key> <string>target</string> </key> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -85,17 +197,61 @@ <value> <dictionary> <item> - <key> <string>field_id</string> </key> - <value> <string>my_parallel_list_field</string> </value> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewTradeFieldLibrary</string> </value> + <key> <string>first_item</string> </key> + <value> <int>0</int> </value> </item> <item> <key> <string>hash_script_id</string> </key> <value> <string>Base_getMultiListFieldPropertyDictList</string> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>required</string> </key> <value> <int>0</int> </value> @@ -104,14 +260,22 @@ <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> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br /> + +]]></string> </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml index cba6fab9c9..8e8e5743db 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml @@ -13,9 +13,9 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>title</string> - <string>items</string> <string>enabled</string> + <string>items</string> + <string>title</string> </list> </value> </item> @@ -59,9 +59,7 @@ <dictionary> <item> <key> <string>enabled</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>field_id</string> </key> @@ -74,13 +72,17 @@ <item> <key> <string>items</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> <key> <string>target</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -88,6 +90,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>my_list_field</string> </value> @@ -96,6 +102,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> @@ -111,22 +123,6 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 9ecf271983..8e3d0d813a 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -660 \ No newline at end of file +663 \ No newline at end of file -- 2.30.9