Commit 6de56892 authored by Aurel's avatar Aurel

some fixes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14074 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2a025456
...@@ -109,7 +109,11 @@ class Number:\n ...@@ -109,7 +109,11 @@ class Number:\n
#return pvalue\n #return pvalue\n
v_value = Number()\n v_value = Number()\n
\n \n
return v_value.numbertoletter(pvalue)\n prefix = \'\'\n
if pvalue < 0:\n
prefix = \'-\'\n
pvalue = -pvalue\n
return prefix + v_value.numbertoletter(pvalue)\n
]]></string> </value> ]]></string> </value>
...@@ -163,6 +167,7 @@ return v_value.numbertoletter(pvalue)\n ...@@ -163,6 +167,7 @@ return v_value.numbertoletter(pvalue)\n
<string>pvalue</string> <string>pvalue</string>
<string>Number</string> <string>Number</string>
<string>v_value</string> <string>v_value</string>
<string>prefix</string>
<string>_getattr_</string> <string>_getattr_</string>
</tuple> </tuple>
</value> </value>
......
...@@ -99,6 +99,14 @@ return getUserSiteUid(user_id=user_id)\n ...@@ -99,6 +99,14 @@ return getUserSiteUid(user_id=user_id)\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
......
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
</item> </item>
<item> <item>
<key> <string>page_template</string> </key> <key> <string>page_template</string> </key>
<value> <string>ListBox_asHTML_original</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>portal_types</string> </key> <key> <string>portal_types</string> </key>
......
...@@ -66,6 +66,8 @@ ...@@ -66,6 +66,8 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>price = context.ERP5Banking_getExchangeValue()\n <value> <string>price = context.ERP5Banking_getExchangeValue()\n
if price is None:\n
return price\n
\n \n
commission_ratio = context.getDiscountRatio()\n commission_ratio = context.getDiscountRatio()\n
commission_price = context.getDiscount()\n commission_price = context.getDiscount()\n
...@@ -142,9 +144,9 @@ return quantity\n ...@@ -142,9 +144,9 @@ return quantity\n
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>price</string> <string>price</string>
<string>None</string>
<string>commission_ratio</string> <string>commission_ratio</string>
<string>commission_price</string> <string>commission_price</string>
<string>None</string>
<string>round</string> <string>round</string>
<string>commission_value</string> <string>commission_value</string>
<string>quantity</string> <string>quantity</string>
......
195 197
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment