[Erp5-report] r6786 - /erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_ac...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Apr 18 16:34:16 CEST 2006
Author: kevin
Date: Tue Apr 18 16:34:15 2006
New Revision: 6786
URL: http://svn.erp5.org?rev=6786&view=rev
Log:
Support optionnal from_date parameter
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml?rev=6786&r1=6785&r2=6786&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml Tue Apr 18 16:34:15 2006
@@ -161,6 +161,10 @@
if node_uid != 0:\n
get_inventory_kw[\'node_uid\'] = node_uid\n
\n
+ opening_balance = 0.0\n
+ debit_movement = 0.0\n
+ credit_movement = 0.0\n
+\n
# Use custom SQL query to get Bank Account Balance (because standard getInventory doesn\'t work)\n
# TODO: use getInventory\n
if kw.has_key(\'bank_account_alt\') and kw[\'bank_account_alt\']:\n
@@ -183,39 +187,43 @@
# Round the result to avoid float bad precision\n
return r_(amount)\n
\n
- values[\'opening_balance\'] = getBalance( to_date = from_date\n
- , **get_inventory_kw\n
- )\n
- values[\'debit_movement\'] = getBalance( from_date = from_date\n
- , at_date = at_date\n
- , omit_input = True\n
- , **get_inventory_kw\n
- )\n
- values[\'credit_movement\'] = - getBalance( from_date = from_date\n
- , at_date = at_date\n
- , omit_output = True\n
- , **get_inventory_kw\n
- )\n
+ if from_date not in (None, \'\'):\n
+ opening_balance = getBalance( to_date = from_date\n
+ , **get_inventory_kw\n
+ )\n
+ debit_movement = getBalance( from_date = from_date\n
+ , at_date = at_date\n
+ , omit_input = True\n
+ , **get_inventory_kw\n
+ )\n
+ credit_movement = - getBalance( from_date = from_date\n
+ , at_date = at_date\n
+ , omit_output = True\n
+ , **get_inventory_kw\n
+ )\n
else:\n
# Use standard methods\n
- values[\'opening_balance\'] = getInventory( to_date = from_date\n
- , **get_inventory_kw\n
- )\n
- values[\'debit_movement\'] = getInventory( from_date = from_date\n
- , at_date = at_date\n
- , omit_output = True\n
- , **get_inventory_kw\n
- )\n
- values[\'credit_movement\'] = - getInventory( from_date = from_date\n
- , at_date = at_date\n
- , omit_input = True\n
- , **get_inventory_kw\n
- )\n
+ if from_date not in (None, \'\'):\n
+ opening_balance = getInventory( to_date = from_date\n
+ , **get_inventory_kw\n
+ )\n
+ debit_movement = getInventory( from_date = from_date\n
+ , at_date = at_date\n
+ , omit_output = True\n
+ , **get_inventory_kw\n
+ )\n
+ credit_movement = - getInventory( from_date = from_date\n
+ , at_date = at_date\n
+ , omit_input = True\n
+ , **get_inventory_kw\n
+ )\n
+\n
+ values[\'opening_balance\'] = opening_balance\n
+ values[\'debit_movement\'] = debit_movement\n
+ values[\'credit_movement\'] = credit_movement\n
\n
# Calculate the closing balance\n
- values[\'closing_balance\'] = values[\'opening_balance\'] + \\\n
- values[\'debit_movement\'] - \\\n
- values[\'credit_movement\']\n
+ values[\'closing_balance\'] = opening_balance + debit_movement - credit_movement\n
return values\n
\n
\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml?rev=6786&r1=6785&r2=6786&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml Tue Apr 18 16:34:15 2006
@@ -88,18 +88,23 @@
\n
# FIXME: Here we do not want to sum all movement < 0, but sum the balances\n
# of all nodes whose which have a < 0 balance...\n
-opening_debit_balance = getInventory( at_date = from_date\n
- , omit_output = True\n
- , **get_inventory_kw\n
- )\n
+opening_debit_balance = 0.0\n
+opening_credit_balance = 0.0\n
+closing_debit_balance = 0.0\n
+closing_credit_balance = 0.0\n
+if from_date not in (None, \'\'):\n
+ opening_debit_balance = getInventory( at_date = from_date\n
+ , omit_output = True\n
+ , **get_inventory_kw\n
+ )\n
+ opening_credit_balance = - getInventory( at_date = from_date\n
+ , omit_input = True\n
+ , **get_inventory_kw\n
+ )\n
closing_debit_balance = getInventory( at_date = at_date\n
, omit_output = True\n
, **get_inventory_kw\n
)\n
-opening_credit_balance = - getInventory( at_date = from_date\n
- , omit_input = True\n
- , **get_inventory_kw\n
- )\n
closing_credit_balance = - getInventory( at_date = at_date\n
, omit_input = True\n
, **get_inventory_kw\n
@@ -108,10 +113,10 @@
list_item = newTempBase(portal, \'xxx\')\n
list_item.setUid(\'new_000\')\n
list_item.edit(** {\n
- \'total_opening_debit_balance\' : opening_debit_balance or 0\n
- , \'total_closing_debit_balance\' : closing_debit_balance or 0\n
- , \'total_opening_credit_balance\': opening_credit_balance or 0\n
- , \'total_closing_credit_balance\': closing_credit_balance or 0\n
+ \'total_opening_debit_balance\' : opening_debit_balance\n
+ , \'total_closing_debit_balance\' : closing_debit_balance\n
+ , \'total_opening_credit_balance\': opening_credit_balance\n
+ , \'total_closing_credit_balance\': closing_credit_balance\n
})\n
\n
return [list_item]\n
@@ -178,11 +183,11 @@
<string>context</string>
<string>portal</string>
<string>getInventory</string>
+ <string>opening_debit_balance</string>
+ <string>opening_credit_balance</string>
+ <string>closing_debit_balance</string>
+ <string>closing_credit_balance</string>
<string>_apply_</string>
- <string>opening_debit_balance</string>
- <string>closing_debit_balance</string>
- <string>opening_credit_balance</string>
- <string>closing_credit_balance</string>
<string>list_item</string>
</tuple>
</value>
More information about the Erp5-report
mailing list