[Erp5-report] r11241 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Nov 10 10:30:58 CET 2006
Author: jerome
Date: Fri Nov 10 10:30:54 2006
New Revision: 11241
URL: http://svn.erp5.org?rev=11241&view=rev
Log:
Hiding balanced accounts is also possible in the Trial Balance
Added:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_balanced_accounts.xml
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_getTrialBalanceReportSectionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_parent_accounts.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=11241&r1=11240&r2=11241&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 Nov 10 10:30:54 2006
@@ -73,12 +73,15 @@
from DateTime import DateTime\n
import math\n
\n
+\n
##########\n
-# This method returns a list of accounts virtually expanded, ie. payable and receivable accounts\n
-# are split by \'destination_section\' categories and bank accounts are split by \'source_payment\'.\n
+# This method returns a list of accounts virtually expanded, ie. payable and\n
+# receivable accounts are split by \'destination_section\' categories and bank\n
+# accounts are split by \'source_payment\'.\n
##########\n
\n
-LOG = lambda msg: context.getPortalObject().log("AccountModule_getAccountListForTrialBalance", msg)\n
+LOG = lambda msg: context.getPortalObject().log(\n
+ "AccountModule_getAccountListForTrialBalance", msg)\n
\n
from_date = kw.get(\'from_date\', None)\n
at_date = kw[\'at_date\']\n
@@ -233,7 +236,8 @@
tmp_accounts = []\n
orga_and_banks = []\n
for orga in organisation_list:\n
- orga_and_banks += [(orga, o.getObject()) for o in orga.searchFolder(portal_type=context.getPortalPaymentNodeTypeList())]\n
+ orga_and_banks += [(orga, o.getObject()) for o in orga.contentValues(\n
+ portal_type=context.getPortalPaymentNodeTypeList())]\n
\n
for orga, bank in orga_and_banks:\n
this_tmp_account = {\n
@@ -256,7 +260,10 @@
this_tmp_account[\'credit_movement\'] != 0 or\n
this_tmp_account[\'debit_movement\'] != 0 or\n
this_tmp_account[\'closing_balance\'] != 0 ):\n
- tmp_accounts.append( account.asContext(**formatValues(this_tmp_account) ) )\n
+ if show_balanced_accounts or (this_tmp_account[\'closing_balance\'] != 0):\n
+ tmp_accounts.append(account.asContext(\n
+ **formatValues(this_tmp_account)))\n
+ \n
return tmp_accounts\n
\n
\n
@@ -283,7 +290,9 @@
if (this_tmp_account[\'opening_balance\'] != 0 or\n
this_tmp_account[\'credit_movement\'] != 0 or\n
this_tmp_account[\'debit_movement\'] != 0 ):\n
- tmp_accounts.append(account.asContext(**formatValues(this_tmp_account)))\n
+ if show_balanced_accounts or (this_tmp_account[\'closing_balance\'] != 0):\n
+ tmp_accounts.append(\n
+ account.asContext(**formatValues(this_tmp_account) ) )\n
return tmp_accounts\n
\n
\n
@@ -466,7 +475,8 @@
if (item[\'opening_balance\'] != 0 or\n
item[\'credit_movement\'] != 0 or\n
item[\'debit_movement\'] != 0 ):\n
- report_items.append(account.asContext(**formatValues(item)))\n
+ if show_balanced_accounts or (item[\'closing_balance\'] != 0):\n
+ report_items.append(account.asContext(**formatValues(item)))\n
\n
# MUST BE FIXED:\n
# virtual_account_list = []\n
@@ -507,7 +517,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>src__=0, **kw</string> </value>
+ <value> <string>src__=0, show_balanced_accounts=0, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -527,13 +537,14 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>src__</string>
+ <string>show_balanced_accounts</string>
<string>kw</string>
<string>DateTime</string>
<string>math</string>
@@ -613,6 +624,7 @@
<value>
<tuple>
<int>0</int>
+ <int>0</int>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml?rev=11241&r1=11240&r2=11241&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml Fri Nov 10 10:30:54 2006
@@ -83,6 +83,7 @@
from_date = request.get(\'from_date\' , None)\n
expand_accounts = request.get(\'expand_accounts\' , False)\n
show_parent_accounts = request.get(\'show_parent_accounts\', False)\n
+show_balanced_accounts = request[\'show_balanced_accounts\']\n
\n
request.other[\'is_accounting_report\'] = True\n
\n
@@ -105,6 +106,7 @@
, \'gap_list\' : gap_list\n
, \'show_parent_accounts\' : show_parent_accounts\n
, \'expand_accounts\' : expand_accounts\n
+ , \'show_balanced_accounts\' : show_balanced_accounts\n
}\n
\n
balance_columns = (\n
@@ -210,6 +212,7 @@
<string>False</string>
<string>expand_accounts</string>
<string>show_parent_accounts</string>
+ <string>show_balanced_accounts</string>
<string>True</string>
<string>_write_</string>
<string>result</string>
Added: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_balanced_accounts.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_balanced_accounts.xml?rev=11241&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_balanced_accounts.xml (added)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_balanced_accounts.xml Fri Nov 10 10:30:54 2006
@@ -1,0 +1,174 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.StandardFields</string>
+ <string>CheckBoxField</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>your_show_balanced_accounts</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Show Balanced Accounts</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_parent_accounts.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_parent_accounts.xml?rev=11241&r1=11240&r2=11241&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_parent_accounts.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_show_parent_accounts.xml Fri Nov 10 10:30:54 2006
@@ -135,7 +135,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=11241&r1=11240&r2=11241&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Nov 10 10:30:54 2006
@@ -1,1 +1,1 @@
-122
+124
More information about the Erp5-report
mailing list