[Erp5-report] r17396 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Nov 5 18:59:14 CET 2007
Author: jerome
Date: Mon Nov 5 18:59:14 2007
New Revision: 17396
URL: http://svn.erp5.org?rev=17396&view=rev
Log:
Initial balance should take into account recievable and payable accounts detailed per third party
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=17396&r1=17395&r2=17396&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 Mon Nov 5 18:59:14 2007
@@ -310,7 +310,13 @@
# standards accounts {{{\n
# balance at period start date\n
for node in getInventoryList(\n
- node_category_strict_membership=account_type_to_group_by_node,\n
+ node_category_strict_membership=[\n
+ \'account_type/asset\',\n
+ \'account_type/asset/cash\',\n
+ \'account_type/asset/receivable/refundable_vat\',\n
+ \'account_type/liability/payable/collected_vat\',\n
+ \'account_type/equity\',\n
+ \'account_type/liability\',],\n
group_by_node=1,\n
to_date=period_start_date,\n
portal_type=accounting_movement_type_list +\n
@@ -327,7 +333,13 @@
\n
# Balance Transaction\n
for node in getInventoryList(\n
- node_category_strict_membership=account_type_to_group_by_node,\n
+ node_category_strict_membership=[\n
+ \'account_type/asset\',\n
+ \'account_type/asset/cash\',\n
+ \'account_type/asset/receivable/refundable_vat\',\n
+ \'account_type/liability/payable/collected_vat\',\n
+ \'account_type/equity\',\n
+ \'account_type/liability\',],\n
group_by_node=1,\n
from_date=from_date,\n
at_date=from_date + 1,\n
@@ -337,13 +349,20 @@
(node[\'node_relative_url\'], MARKER, MARKER),\n
dict(debit=0, credit=0))\n
total_price = node[\'total_price\'] or 0\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
+ account_props[\'initial_debit_balance\'] = account_props.get(\n
+ \'initial_debit_balance\', 0) + max(total_price, 0)\n
+ account_props[\'initial_credit_balance\'] = account_props.get(\n
+ \'initial_credit_balance\', 0) + max(- total_price, 0)\n
+\n
+\n
+for node in getInventoryList(\n
+ node_category_strict_membership=[\n
+ \'account_type/asset\',\n
+ \'account_type/asset/cash\',\n
+ \'account_type/asset/receivable/refundable_vat\',\n
+ \'account_type/liability/payable/collected_vat\',\n
+ \'account_type/equity\',\n
+ \'account_type/liability\',],\n
group_by_node=1,\n
omit_output=1,\n
from_date=period_start_date,\n
@@ -358,7 +377,13 @@
\'initial_debit_balance\', 0) + total_price\n
\n
for node in getInventoryList(\n
- node_category_strict_membership=account_type_to_group_by_node,\n
+ node_category_strict_membership=[\n
+ \'account_type/asset\',\n
+ \'account_type/asset/cash\',\n
+ \'account_type/asset/receivable/refundable_vat\',\n
+ \'account_type/liability/payable/collected_vat\',\n
+ \'account_type/equity\',\n
+ \'account_type/liability\',],\n
group_by_node=1,\n
omit_input=1,\n
from_date=period_start_date,\n
@@ -408,45 +433,51 @@
# }}}\n
\n
# payable / receivable accounts {{{\n
-if account_type_to_group_by_mirror_section:\n
- # initial balance\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
- to_date=period_start_date,\n
- portal_type=accounting_movement_type_list +\n
- 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_debit_balance\'] = account_props.get(\n
- \'initial_debit_balance\', 0) + max(total_price, 0)\n
- account_props[\'initial_credit_balance\'] = account_props.get(\n
- \'initial_credit_balance\', 0) + max(-total_price, 0)\n
-\n
- # Balance Transactions\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
- 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
- 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
+# initial balance\n
+for node in getInventoryList(\n
+ node_category_strict_membership=[\n
+ \'account_type/asset/receivable\',\n
+ \'account_type/liability/payable\', ],\n
+ group_by_mirror_section=1,\n
+ group_by_node=1,\n
+ to_date=period_start_date,\n
+ portal_type=accounting_movement_type_list +\n
+ balance_movement_type_list,\n
+ **inventory_params):\n
+ mirror_section_uid = MARKER\n
+ if expand_accounts:\n
+ mirror_section_key = node[\'mirror_section_uid\']\n
+ account_props = line_per_account.setdefault(\n
+ (node[\'node_relative_url\'], mirror_section_key, 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) + max(total_price, 0)\n
+ account_props[\'initial_credit_balance\'] = account_props.get(\n
+ \'initial_credit_balance\', 0) + max(-total_price, 0)\n
+\n
+# Balance Transactions\n
+for node in getInventoryList(\n
+ node_category_strict_membership=[\n
+ \'account_type/asset/receivable\',\n
+ \'account_type/liability/payable\', ],\n
+ group_by_mirror_section=1,\n
+ group_by_node=1,\n
+ from_date=from_date,\n
+ at_date=from_date + 1,\n
+ portal_type=balance_movement_type_list,\n
+ **inventory_params):\n
+ mirror_section_uid = MARKER\n
+ if expand_accounts:\n
+ mirror_section_key = node[\'mirror_section_uid\']\n
+ account_props = line_per_account.setdefault(\n
+ (node[\'node_relative_url\'], mirror_section_key, 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) + max(total_price, 0)\n
+ account_props[\'initial_credit_balance\'] = account_props.get(\n
+ \'initial_credit_balance\', 0) + max(- total_price, 0)\n
\n
for node in getInventoryList(\n
node_category_strict_membership=\n
@@ -458,8 +489,11 @@
to_date=from_date,\n
portal_type=accounting_movement_type_list,\n
**inventory_params):\n
+ mirror_section_uid = MARKER\n
+ if expand_accounts:\n
+ mirror_section_key = node[\'mirror_section_uid\']\n
account_props = line_per_account.setdefault(\n
- (node[\'node_relative_url\'], node[\'mirror_section_uid\'], MARKER),\n
+ (node[\'node_relative_url\'], mirror_section_key, 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
@@ -475,8 +509,11 @@
to_date=from_date,\n
portal_type=accounting_movement_type_list,\n
**inventory_params):\n
+ mirror_section_uid = MARKER\n
+ if expand_accounts:\n
+ mirror_section_key = node[\'mirror_section_uid\']\n
account_props = line_per_account.setdefault(\n
- (node[\'node_relative_url\'], node[\'mirror_section_uid\'], MARKER),\n
+ (node[\'node_relative_url\'], mirror_section_key, 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
@@ -805,9 +842,10 @@
<string>getNodeTitleAndId</string>
<string>initial_balance_date</string>
<string>min</string>
+ <string>mirror_section_uid</string>
+ <string>mirror_section_key</string>
<string>line_list</string>
<string>node_relative_url</string>
- <string>mirror_section_uid</string>
<string>payment_uid</string>
<string>data</string>
<string>node_title</string>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=17396&r1=17395&r2=17396&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Mon Nov 5 18:59:14 2007
@@ -1,1 +1,1 @@
-487
+488
More information about the Erp5-report
mailing list