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

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Jan 17 10:44:33 2008
New Revision: 18759

URL: http://svn.erp5.org?rev=18759&view=rev
Log:
Journal report have to filter both on parent_portal_type and portal type, because some transactions contains non accounting lines in stock tables (for instance pay sheet lines in pay sheet transaction)

Added:
    erp5/trunk/bt5/erp5_accounting/bt/template_catalog_scriptable_key_list
Modified:
    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/AccountingTransactionModule_getJournalSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml?rev=18759&r1=18758&r2=18759&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml Thu Jan 17 10:44:33 2008
@@ -90,6 +90,9 @@
                                 from_date=from_date,\n
                                 at_date=at_date,\n
                                 section_uid=section_uid,\n
+                                portal_type=portal.getPortalAccountingMovementTypeList(),\n
+      # note that we pass both portal_type and parent_portal_type because some transactions\n
+      # may contain some non accounting lines that are in stock table (eg. Pay Sheet Lines)\n
                                 parent_portal_type=portal_type,\n
                                 simulation_state=simulation_state,\n
                                 sort_on=((\'stock.date\', \'ASC\'),\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=18759&r1=18758&r2=18759&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Thu Jan 17 10:44:33 2008
@@ -1,1 +1,1 @@
-539
+540

Added: erp5/trunk/bt5/erp5_accounting/bt/template_catalog_scriptable_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/template_catalog_scriptable_key_list?rev=18759&view=auto
==============================================================================
    (empty)