[Erp5-report] r17053 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 19 16:41:56 CEST 2007
Author: jerome
Date: Fri Oct 19 16:41:56 2007
New Revision: 17053
URL: http://svn.erp5.org?rev=17053&view=rev
Log:
Simplify the way to take into account Balance Transctions for initial balance
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
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=17053&r1=17052&r2=17053&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 Fri Oct 19 16:41:56 2007
@@ -332,7 +332,6 @@
for node in getInventoryList(\n
node_category_strict_membership=account_type_to_group_by_node,\n
group_by_node=1,\n
- omit_output=1,\n
from_date=from_date,\n
at_date=from_date + 1,\n
portal_type=balance_movement_type_list,\n
@@ -341,23 +340,10 @@
(node[\'node_relative_url\'], MARKER, MARKER),\n
dict(debit=0, credit=0))\n
total_price = node[\'total_price\'] or 0\n
- account_props[\'initial_debit_balance\'] = account_props.get(\n
- \'initial_debit_balance\', 0) + total_price\n
-\n
-for node in getInventoryList(\n
- node_category_strict_membership=account_type_to_group_by_node,\n
- group_by_node=1,\n
- omit_input=1,\n
- from_date=from_date,\n
- at_date=from_date + 1,\n
- portal_type=balance_movement_type_list,\n
- **inventory_params):\n
- account_props = line_per_account.setdefault(\n
- (node[\'node_relative_url\'], MARKER, MARKER),\n
- dict(debit=0, credit=0))\n
- total_price = node[\'total_price\'] or 0\n
- account_props[\'initial_credit_balance\'] = account_props.get(\n
- \'initial_credit_balance\', 0) - total_price\n
+ total_price += account_props.get(\'initial_debit_balance\', 0)\n
+ total_price -= account_props.get(\'initial_credit_balance\', 0)\n
+ account_props[\'initial_debit_balance\'] = max(total_price, 0)\n
+ account_props[\'initial_credit_balance\'] = max(- total_price, 0)\n
\n
for node in getInventoryList(\n
node_category_strict_membership=account_type_to_group_by_node,\n
@@ -451,7 +437,6 @@
account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n
group_by_node=1,\n
- omit_output=1,\n
from_date=from_date,\n
at_date=from_date + 1,\n
portal_type=balance_movement_type_list,\n
@@ -460,25 +445,11 @@
(node[\'node_relative_url\'], node[\'mirror_section_uid\'], MARKER),\n
dict(debit=0, credit=0))\n
total_price = node[\'total_price\'] or 0\n
- account_props[\'initial_debit_balance\'] = account_props.get(\n
- \'initial_debit_balance\', 0) + total_price\n
-\n
- for node in getInventoryList(\n
- node_category_strict_membership=\n
- account_type_to_group_by_mirror_section,\n
- group_by_mirror_section=1,\n
- group_by_node=1,\n
- omit_input=1,\n
- from_date=from_date,\n
- at_date=from_date + 1,\n
- portal_type=balance_movement_type_list,\n
- **inventory_params):\n
- account_props = line_per_account.setdefault(\n
- (node[\'node_relative_url\'], node[\'mirror_section_uid\'], MARKER),\n
- dict(debit=0, credit=0))\n
- total_price = node[\'total_price\'] or 0\n
- account_props[\'initial_credit_balance\'] = account_props.get(\n
- \'initial_credit_balance\', 0) - total_price\n
+ total_price += account_props.get(\'initial_debit_balance\', 0)\n
+ total_price -= account_props.get(\'initial_credit_balance\', 0)\n
+ account_props[\'initial_debit_balance\'] = max(total_price, 0)\n
+ account_props[\'initial_credit_balance\'] = max(- total_price, 0)\n
+\n
\n
for node in getInventoryList(\n
node_category_strict_membership=\n
@@ -542,7 +513,6 @@
account_type_to_group_by_payment,\n
group_by_payment=1,\n
group_by_node=1,\n
- omit_output=1,\n
from_date=from_date,\n
at_date=from_date + 1,\n
portal_type=balance_movement_type_list,\n
@@ -552,26 +522,10 @@
(node[\'node_relative_url\'], MARKER, node[\'payment_uid\']),\n
dict(debit=0, credit=0))\n
total_price = node[\'total_price\'] or 0\n
- account_props[\'initial_debit_balance\'] = account_props.get(\n
- \'initial_debit_balance\', 0) + total_price\n
-\n
- for node in getInventoryList(\n
- node_category_strict_membership=\n
- account_type_to_group_by_payment,\n
- group_by_payment=1,\n
- group_by_node=1,\n
- omit_input=1,\n
- from_date=from_date,\n
- at_date=from_date + 1,\n
- portal_type=balance_movement_type_list,\n
- **inventory_params):\n
- account_used[node[\'node_relative_url\']] = 1\n
- account_props = line_per_account.setdefault(\n
- (node[\'node_relative_url\'], MARKER, node[\'payment_uid\']),\n
- dict(debit=0, credit=0))\n
- total_price = node[\'total_price\'] or 0\n
- account_props[\'initial_credit_balance\'] = account_props.get(\n
- \'initial_credit_balance\', 0) - total_price\n
+ total_price += account_props.get(\'initial_debit_balance\', 0)\n
+ total_price -= account_props.get(\'initial_credit_balance\', 0)\n
+ account_props[\'initial_debit_balance\'] = max(total_price, 0)\n
+ account_props[\'initial_credit_balance\'] = max(- total_price, 0)\n
\n
for node in getInventoryList(\n
node_category_strict_membership=\n
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=17053&r1=17052&r2=17053&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Oct 19 16:41:56 2007
@@ -1,1 +1,1 @@
-442
+443
More information about the Erp5-report
mailing list