[Erp5-report] r10525 - /erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_a...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Oct  4 13:56:40 2006
New Revision: 10525

URL: http://svn.erp5.org?rev=10525&view=rev
Log:
fix Other Parties report with new Entity_viewAccountingTransactionList column names

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml?rev=10525&r1=10524&r2=10525&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml Wed Oct  4 13:56:40 2006
@@ -97,7 +97,7 @@
   , \'section_category\'            : transaction_section_category\n
   , \'simulation_state\'            : transaction_simulation_state\n
   , \'report_depth\'                : 5\n
-  , \'where_expression\'            : " section.portal_type = \'Organisation\' "\n
+  #, \'where_expression\'            : " section.portal_type = \'Organisation\' "\n
 }\n
 \n
 params[\'hide_grouping\'] = request[\'omit_grouped_references\']\n
@@ -111,15 +111,15 @@
 \n
 entity_columns = [\n
                        (\'date\', \'Date\'),\n
-                       (\'parent_portal_type\', \'Type\'),\n
-                       (\'Entity_getAccountingTransactionGapId\', \'GAP\'),\n
-                       (\'parent_reference\', \'Invoice No\'),\n
-                       (\'parent_title\', \'Title\'),\n
-                       (\'parent_specific_reference\', \'Reference\'),\n
-                       (\'translated_simulation_state_title\', \'State\'),\n
-                       (\'debit\', \'Debit\'),\n
-                       (\'credit\', \'Credit\'),\n
-                       (\'net_balance\', \'Balance\'),\n
+                       (\'Movement_getExplanationTranslatedPortalType\', \'Type\'),\n
+                       (\'Movement_getNodeGapId\', \'GAP\'),\n
+                       (\'Movement_getExplanationReference\', \'Invoice No\'),\n
+                       (\'Movement_getExplanationTitle\', \'Title\'),\n
+                       (\'Movement_getSpecificReference\', \'Reference\'),\n
+                       (\'getTranslatedSimulationStateTitle\', \'State\'),\n
+                       (\'Movement_getDebitPrice\', \'Debit\'),\n
+                       (\'Movement_getCreditPrice\', \'Credit\'),\n
+                       (\'running_total_price\', \'Balance\'),\n
 ]\n
 \n
 # build a list of all accounts which _strictly_ belongs to categories \n
@@ -166,11 +166,11 @@
                                level=1,\n
                                path=o.getPhysicalPath(),\n
                                form_id=\'Entity_viewAccountingTransactionList\',\n
-                               selection_name = \'accounting_selection\',\n
+                               selection_name = \'other_parties_report_selection\',\n
                                selection_params = params,\n
                                selection_columns = entity_columns,\n
-                               selection_sort_order=[(\'delivery.stop_date\',\n
-                                                      \'ascending\')], ) )\n
+                               selection_sort_order=[(\'stock.date\', \'ascending\'),\n
+                                                      (\'stock.uid\', \'ascending\'),],))\n
 \n
 return result\n
 

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml?rev=10525&r1=10524&r2=10525&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml Wed Oct  4 13:56:40 2006
@@ -76,6 +76,15 @@
                         <string>transaction_section_category</string>
                         <string>transaction_simulation_state</string>
                         <string>at_date</string>
+                        <string>my_entity_role</string>
+                        <string>my_from_date</string>
+                        <string>my_node_category</string>
+                        <string>my_omit_balanced_accounts</string>
+                        <string>my_omit_empty_accounts</string>
+                        <string>my_omit_grouped_references</string>
+                        <string>my_to_date</string>
+                        <string>my_transaction_section_category</string>
+                        <string>my_transaction_simulation_state</string>
                       </list>
                     </value>
                 </item>