[Erp5-report] r16210 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Sep 10 11:29:19 CEST 2007
Author: vincent
Date: Mon Sep 10 11:29:19 2007
New Revision: 16210
URL: http://svn.erp5.org?rev=16210&view=rev
Log:
Move hidden fields to right group in fast input form. This simplifies field sort and reduces a small gap at top.
Make my_target_total_price a well-formated float field instead of a string field.
Translate by hand module title in CashDelivery_generateCashDetailInputDialog since transalation accessor does not work on module.
Modified:
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_target_total_price.xml
erp5/trunk/bt5/erp5_banking_core/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml?rev=16210&r1=16209&r2=16210&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml Mon Sep 10 11:29:19 2007
@@ -89,7 +89,15 @@
currency_cash_portal_type = cash_detail_dict[\'currency_cash_portal_type\']\n
\n
if fast_input_title is None:\n
- fast_input_title = \'%s - %s\' % (context.getParentValue().getTranslatedTitle(), context.getSourceReference())\n
+ # Module getTranslatedTitle does not return a translated string.\n
+ # Borrow code from ERP5Site_getModuleItemList to achieve hand translation.\n
+ # XXX: Pass title value as a list to work around an encoding bug in TextWidget:\n
+ # It renders given value as a list of str, and casting to str throws an error when\n
+ # encountering UTF-8 chars. This cast is not called when provided value is a tuple\n
+ # or a list...\n
+ fast_input_title = [\'%s - %s\' % \\\n
+ (context.getPortalObject().Localizer.erp5_ui.gettext(context.getParentValue().getTitle()),\n
+ context.getSourceReference())]\n
if \'target_total_price\' not in kw:\n
target_total_price = context.getSourceTotalAssetPrice()\n
else:\n
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm.xml?rev=16210&r1=16209&r2=16210&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm.xml Mon Sep 10 11:29:19 2007
@@ -128,22 +128,23 @@
<key> <string>left</string> </key>
<value>
<list>
+ <string>my_fast_input_title</string>
+ <string>my_target_total_price</string>
+ <string>my_calculated_price</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>right</string> </key>
+ <value>
+ <list>
<string>my_variation_list</string>
<string>my_operation_currency</string>
<string>my_cash_status_list</string>
<string>my_emission_letter_list</string>
<string>my_line_portal_type</string>
<string>my_other_parameter</string>
- <string>my_calculated_price</string>
- <string>my_target_total_price</string>
- <string>my_fast_input_title</string>
</list>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
</value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_target_total_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_target_total_price.xml?rev=16210&r1=16209&r2=16210&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_target_total_price.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_target_total_price.xml Mon Sep 10 11:29:19 2007
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <global name="FloatField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
@@ -28,13 +28,13 @@
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
+ <key> <string>not_float</string> </key>
+ <value> <string>You did not enter a floating point number.</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>too_long</string> </key>
- <value> <string>Too much input was given.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -87,7 +87,11 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_length</string> </key>
+ <key> <string>input_style</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -96,14 +100,6 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -164,7 +160,13 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_length</string> </key>
+ <key> <string>input_style</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -176,14 +178,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
@@ -200,7 +194,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
@@ -232,15 +226,19 @@
</item>
<item>
<key> <string>extra</string> </key>
- <value> <string></string> </value>
+ <value> <string>align="right"</string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1 234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <int>2</int> </value>
</item>
<item>
<key> <string>required</string> </key>
@@ -249,14 +247,6 @@
<item>
<key> <string>title</string> </key>
<value> <string>Target total price</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>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
@@ -284,4 +274,20 @@
</dictionary>
</pickle>
</record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=16210&r1=16209&r2=16210&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Mon Sep 10 11:29:19 2007
@@ -1,1 +1,1 @@
-354
+355
More information about the Erp5-report
mailing list