From 25bd4bbed6b4237839aaf5e9a9801d3d86f92783 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Wed, 9 May 2007 12:27:57 +0000 Subject: [PATCH] Use string field instead of list field. "my_" prefix is reserved for properties directly accessible on the object, use "your_" instead in other cases. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14432 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../CheckbookReceptionLine_view.xml | 2 +- ...itle.xml => your_price_currency_title.xml} | 91 +++++++++---------- bt5/erp5_banking_check/bt/revision | 2 +- 3 files changed, 45 insertions(+), 50 deletions(-) rename bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/{my_price_currency_title.xml => your_price_currency_title.xml} (87%) diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view.xml index 9034a9101f..95942bc076 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view.xml @@ -103,7 +103,7 @@ <string>my_resource_title</string> <string>my_quantity</string> <string>my_destination_payment_reference</string> - <string>my_price_currency_title</string> + <string>your_price_currency_title</string> <string>my_reference_range_min</string> <string>my_reference_range_max</string> </list> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_price_currency_title.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/your_price_currency_title.xml similarity index 87% rename from bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_price_currency_title.xml rename to bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/your_price_currency_title.xml index f15319788f..5c3e7b5a16 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_price_currency_title.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/your_price_currency_title.xml @@ -3,7 +3,7 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="ListField" module="Products.Formulator.StandardFields"/> + <global name="StringField" module="Products.Formulator.StandardFields"/> <tuple/> </tuple> </pickle> @@ -17,7 +17,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_price_currency_title</string> </value> + <value> <string>your_price_currency_title</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -32,8 +32,8 @@ <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> + <key> <string>too_long</string> </key> + <value> <string>Too much input was given.</string> </value> </item> </dictionary> </value> @@ -59,27 +59,27 @@ <value> <string></string> </value> </item> <item> - <key> <string>editable</string> </key> + <key> <string>display_maxwidth</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>enabled</string> </key> + <key> <string>display_width</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>external_validator</string> </key> + <key> <string>editable</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>extra</string> </key> + <key> <string>enabled</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>extra_item</string> </key> + <key> <string>external_validator</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>first_item</string> </key> + <key> <string>extra</string> </key> <value> <string></string> </value> </item> <item> @@ -87,7 +87,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>max_length</string> </key> <value> <string></string> </value> </item> <item> @@ -95,11 +95,11 @@ <value> <string></string> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>truncate</string> </key> <value> <string></string> </value> </item> <item> @@ -127,34 +127,36 @@ </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>editable</string> </key> + <key> <string>display_maxwidth</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>enabled</string> </key> + <key> <string>display_width</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>external_validator</string> </key> + <key> <string>editable</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>extra</string> </key> + <key> <string>enabled</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>extra_item</string> </key> + <key> <string>external_validator</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>first_item</string> </key> + <key> <string>extra</string> </key> <value> <string></string> </value> </item> <item> @@ -162,21 +164,19 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <key> <string>max_length</string> </key> + <value> <string></string> </value> </item> <item> <key> <string>required</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>truncate</string> </key> <value> <string></string> </value> </item> <item> @@ -210,6 +210,14 @@ <key> <string>description</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> <item> <key> <string>editable</string> </key> <value> <int>0</int> </value> @@ -226,36 +234,26 @@ <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> <int>0</int> </value> - </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> + <key> <string>max_length</string> </key> + <value> <string></string> </value> </item> <item> <key> <string>required</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>size</string> </key> - <value> <int>1</int> </value> - </item> <item> <key> <string>title</string> </key> <value> <string>Currency</string> </value> </item> + <item> + <key> <string>truncate</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>unicode</string> </key> <value> <int>0</int> </value> @@ -273,18 +271,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.CurrencyExchange_getCurrencyList()</string> </value> + <value> <string>python: here.getDestinationPaymentValue().getPriceCurrencyTitle()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index 66321c084c..1a1f7f8270 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -189 \ No newline at end of file +190 \ No newline at end of file -- 2.30.9