[Erp5-report] r29424 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Oct  6 13:14:16 2009
New Revision: 29424

URL: http://svn.erp5.org?rev=29424&view=rev
Log:
propagate function and project properly in trial balance report

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/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=29424&r1=29423&r2=29424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml [utf8] Tue Oct  6 13:14:16 2009
@@ -82,6 +82,10 @@
                         group_by_resource=0)\n
 if portal_type and portal_type != portal.getPortalAccountingTransactionTypeList():\n
   inventory_params[\'parent_portal_type\'] = portal_type\n
+if function:\n
+  inventory_params[\'function\'] = function\n
+if project:\n
+  inventory_params[\'project\'] = project\n
 \n
 if node_uid:\n
   inventory_params[\'node_uid\'] = node_uid\n
@@ -726,7 +730,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>show_empty_accounts, expand_accounts, at_date, from_date, period_start_date, section_uid, simulation_state, precision, node_uid, gap_root=None, per_account_class_summary=0, portal_type=None, **kw</string> </value>
+            <value> <string>show_empty_accounts, expand_accounts, at_date, from_date, period_start_date, section_uid, simulation_state, precision, node_uid, gap_root=None, per_account_class_summary=0, portal_type=None, function=None, project=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -746,7 +750,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>12</int> </value>
+                        <value> <int>14</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -764,6 +768,8 @@
                             <string>gap_root</string>
                             <string>per_account_class_summary</string>
                             <string>portal_type</string>
+                            <string>function</string>
+                            <string>project</string>
                             <string>kw</string>
                             <string>Products.PythonScripts.standard</string>
                             <string>Object</string>
@@ -862,6 +868,8 @@
                 <none/>
                 <int>0</int>
                 <none/>
+                <none/>
+                <none/>
               </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=29424&r1=29423&r2=29424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml [utf8] Tue Oct  6 13:14:16 2009
@@ -64,6 +64,8 @@
 at_date  = request[\'at_date\']\n
 from_date = request.get(\'from_date\', None)\n
 portal_type = request.get(\'portal_type\', None)\n
+function = request.get(\'function\', None)\n
+project = request.get(\'project\', None)\n
 simulation_state = request[\'simulation_state\']\n
 expand_accounts = request.get(\'expand_accounts\', False)\n
 show_empty_accounts = request[\'show_empty_accounts\']\n
@@ -113,6 +115,8 @@
                                   period_start_date=\n
                                           period_start_date.earliestTime(),\n
                                   section_uid=section_uid,\n
+                                  function=function,\n
+                                  project=project,\n
                                   portal_type=portal_type,\n
                                   simulation_state=simulation_state,\n
                                   precision=precision,\n
@@ -168,6 +172,8 @@
                             <string>None</string>
                             <string>from_date</string>
                             <string>portal_type</string>
+                            <string>function</string>
+                            <string>project</string>
                             <string>simulation_state</string>
                             <string>False</string>
                             <string>expand_accounts</string>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=29424&r1=29423&r2=29424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Tue Oct  6 13:14:16 2009
@@ -1,1 +1,1 @@
-987
+988