[Erp5-report] r12473 - /erp5/trunk/products/ERP5Form/FormulatorPatch.py

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan 31 10:28:31 2007
New Revision: 12473

URL: http://svn.erp5.org?rev=12473&view=rev
Log:
like 12287, but only use '%f' is '%s' uses exponential format


Modified:
    erp5/trunk/products/ERP5Form/FormulatorPatch.py

Modified: erp5/trunk/products/ERP5Form/FormulatorPatch.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/FormulatorPatch.py?rev=12473&r1=12472&r2=12473&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/FormulatorPatch.py (original)
+++ erp5/trunk/products/ERP5Form/FormulatorPatch.py Wed Jan 31 10:28:31 2007
@@ -1006,16 +1006,18 @@
         if value not in (None,''):
           input_style = field.get_value('input_style')
           percent = 0
+          original_value = value
           if input_style.find('%')>=0:
             percent=1
             value = float(value) * 100
           try :
-            value = '%f' % (float(value))
+            value = str(float(value))
           except ValueError:
             return value
           else:
-            if 'e' in value: # scientific notation hack
-              return value
+            if 'e' in value:
+              # %f will not use exponential format
+              return '%f' % float(original_value)
           value_list = value.split('.')
           integer = value_list[0]
           if input_style.find(' ')>=0: