[Erp5-report] r45564 vincent - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/porta...

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Apr 19 11:45:45 2011
New Revision: 45564

URL: http://svn.erp5.org?rev=45564&view=rev
Log:
By default, round account balance at resource's precision.

Always provide unmodified balance as a separate result.
Also, fix coding style.

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml?rev=45564&r1=45563&r2=45564&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml [utf8] Tue Apr 19 11:45:45 2011
@@ -59,26 +59,37 @@
 payment_value = context.restrictedTraverse(payment)\n
 \n
 if not payment_value.BankAccount_isOpened():\n
-  return {\'error_code\':2} # closed account\n
+  return {\'error_code\': 2} # closed account\n
 \n
 account_balance = payment_value.BankAccount_getAvailablePosition(src__=src__)\n
 if src__:\n
   return account_balance\n
 # XXX: BankAccount_getAvailablePosition returns position as a string for some reason...\n
-account_balance = float(account_balance)\n
+raw_account_balance = account_balance = float(account_balance)\n
+if round_balance:\n
+  account_balance = round(account_balance, resource.getQuantityPrecision())\n
 \n
-if account_balance - quantity < 0 :\n
-  return {\'error_code\':1, \'balance\':account_balance} # insufficient balance\n
+if account_balance - quantity < 0:\n
+  # insufficient balance\n
+  return {\n
+    \'error_code\': 1,\n
+    \'balance\': account_balance,\n
+    \'raw_balance\': raw_account_balance,\n
+  }\n
 \n
 payment_value.serialize()\n
-return {\'error_code\':0, \'balance\':account_balance} # ok\n
+return {\n
+  \'error_code\': 0,\n
+  \'balance\': account_balance,\n
+  \'raw_balance\': raw_account_balance,\n
+}\n
 
 
 ]]></string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>payment, quantity, src__=0</string> </value>
+            <value> <string>payment, quantity, round_balance=True, src__=0</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=45564&r1=45563&r2=45564&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision [utf8] Tue Apr 19 11:45:45 2011
@@ -1 +1 @@
-571
\ No newline at end of file
+572
\ No newline at end of file