[Erp5-report] r36199 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Jun 10 10:23:18 2010
New Revision: 36199

URL: http://svn.erp5.org?rev=36199&view=rev
Log:
fix some regressions in reports

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getProjectItemList.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml?rev=36199&r1=36198&r2=36199&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml [utf8] Thu Jun 10 10:23:18 2010
@@ -194,6 +194,7 @@ account_type_to_group_by_mirror_section 
 \n
 if gap_list or gap_root:\n
   params[\'node_category\'] = gap_list or gap_root\n
+  default_selection_params[\'node_category\'] = gap_list or gap_root\n
 \n
 report_section_list = []\n
 \n

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getProjectItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getProjectItemList.xml?rev=36199&r1=36198&r2=36199&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getProjectItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getProjectItemList.xml [utf8] Thu Jun 10 10:23:18 2010
@@ -56,6 +56,7 @@
             <value> <string>"""Returns the item list of possible projects to use on accounting lines.\n
 \n
 This script is indented to be used on custom listfields for accounting lines, and on reports.\n
+If this script returns an empty list, it means that reports by project are disabled.\n
 """\n
 portal = context.getPortalObject()\n
 request = portal.REQUEST\n
@@ -79,6 +80,8 @@ if context.getPortalType() == \'Accounti
       project = getObject(brain.project_uid)\n
       project_list.append((project.getTitle(), project.getRelativeUrl(),))\n
   project_list.sort(key=lambda x:x[0])\n
+  if not project_list:\n
+    return [] # returning an empty list, not to add project column on reports\n
   return [(\'\', \'\')] + project_list\n
   \n
 # case 2: script is used on custom listfields.\n

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml?rev=36199&r1=36198&r2=36199&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml [utf8] Thu Jun 10 10:23:18 2010
@@ -65,6 +65,7 @@ if payment:\n
 \n
 if group_by:\n
   extra_kw[\'group_by\'] = group_by\n
+  extra_kw[\'ignore_group_by\'] = True\n
 \n
 account_title_cache = dict()\n
 def getAccountId(node_relative_url):\n
@@ -230,6 +231,7 @@ return line_list\n
                             <string>dict</string>
                             <string>extra_kw</string>
                             <string>_write_</string>
+                            <string>True</string>
                             <string>account_title_cache</string>
                             <string>getAccountId</string>
                             <string>account_in_gap_root_cache</string>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=36199&r1=36198&r2=36199&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Thu Jun 10 10:23:18 2010
@@ -1 +1 @@
-1263
\ No newline at end of file
+1268
\ No newline at end of file