[Erp5-report] r29349 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 1 15:24:45 CEST 2009
Author: fabien
Date: Thu Oct 1 15:24:43 2009
New Revision: 29349
URL: http://svn.erp5.org?rev=29349&view=rev
Log:
- use same float number style for all float fields of the FieldLibrary
- in preferred_float_number_style, use items instead of tales, this avoid error and make it more readable, add a missing float style (thanks to jerome)
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_float_field.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_money_quantity.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_float_number_style.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_float_field.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_float_field.xml?rev=29349&r1=29348&r2=29349&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_float_field.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_float_field.xml [utf8] Thu Oct 1 15:24:43 2009
@@ -279,7 +279,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1234.5\')</string> </value>
+ <value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1 234.5\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_money_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_money_quantity.xml?rev=29349&r1=29348&r2=29349&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_money_quantity.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_money_quantity.xml [utf8] Thu Oct 1 15:24:43 2009
@@ -155,15 +155,17 @@
</item>
<item>
<key> <string>input_style</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>precision</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
+ <key> <string>precision</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
@@ -255,11 +257,8 @@
<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>
@@ -274,11 +273,24 @@
<record id="3" aka="AAAAAAAAAAM=">
<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: preferences.getPreference(\'preferred_float_number_style\', \'-1 234.5\')</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_float_number_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_float_number_style.xml?rev=29349&r1=29348&r2=29349&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_float_number_style.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_float_number_style.xml [utf8] Thu Oct 1 15:24:43 2009
@@ -157,9 +157,7 @@
</item>
<item>
<key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
@@ -235,7 +233,32 @@
<item>
<key> <string>items</string> </key>
<value>
- <list/>
+ <list>
+ <tuple>
+ <string></string>
+ <string></string>
+ </tuple>
+ <tuple>
+ <string>-1234.5</string>
+ <string>-1234.5</string>
+ </tuple>
+ <tuple>
+ <string>-1 234.5</string>
+ <string>-1 234.5</string>
+ </tuple>
+ <tuple>
+ <string>-1 234,5</string>
+ <string>-1 234,5</string>
+ </tuple>
+ <tuple>
+ <string>-1.234,5</string>
+ <string>-1.234,5</string>
+ </tuple>
+ <tuple>
+ <string>-1,234.5</string>
+ <string>-1,234.5</string>
+ </tuple>
+ </list>
</value>
</item>
<item>
@@ -260,22 +283,6 @@
</item>
</dictionary>
</value>
- </item>
- </dictionary>
- </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: [(\'\', \'\'), (\'-1234.5\', \'-1234.5\'),(\'-1 234.5\', \'-1 234.5\'), (\'-1 234,5\', \'-1 234,5\'), (\'-1.234,5\', \'-1,234.5\')]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=29349&r1=29348&r2=29349&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Oct 1 15:24:43 2009
@@ -1,1 +1,1 @@
-1319
+1320
More information about the Erp5-report
mailing list