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

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Dec  5 19:00:55 2008
New Revision: 24813

URL: http://svn.erp5.org?rev=24813&view=rev
Log:
specify portal type in stat to make sure we don't select tax lines

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml?rev=24813&r1=24812&r2=24813&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] Fri Dec  5 19:00:55 2008
@@ -583,6 +583,7 @@
         AND category.uid = stock.section_uid\n
         AND child.uid = stock.uid\n
         AND child.parent_uid = catalog.uid\n
+        AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
         <dtml-if omit_input> AND stock.total_price < 0\n
                              AND stock.uid = movement.uid\n
         </dtml-if>\n
@@ -799,6 +800,7 @@
             AND category.uid = stock.section_uid\n
             AND child.uid = stock.uid\n
             AND child.parent_uid = catalog.uid\n
+            AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
             <dtml-if omit_input> AND stock.total_price < 0\n
                                  AND stock.uid = movement.uid\n
             </dtml-if>\n
@@ -983,6 +985,7 @@
             AND category.uid = stock.section_uid\n
             AND child.uid = stock.uid\n
             AND child.parent_uid = catalog.uid\n
+            AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
             <dtml-if omit_input> AND stock.total_price < 0\n
                                  AND stock.uid = movement.uid\n
             </dtml-if>\n
@@ -1232,6 +1235,7 @@
         AND category.uid = stock.section_uid\n
         AND child.uid = stock.uid\n
         AND child.parent_uid = catalog.uid\n
+        AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
         <dtml-if omit_input> AND stock.total_price < 0\n
                              AND stock.uid = movement.uid\n
         </dtml-if>\n
@@ -1448,6 +1452,7 @@
             AND category.uid = stock.section_uid\n
             AND child.uid = stock.uid\n
             AND child.parent_uid = catalog.uid\n
+            AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
             <dtml-if omit_input> AND stock.total_price < 0\n
                                  AND stock.uid = movement.uid\n
             </dtml-if>\n
@@ -1632,6 +1637,7 @@
             AND category.uid = stock.section_uid\n
             AND child.uid = stock.uid\n
             AND child.parent_uid = catalog.uid\n
+            AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
             <dtml-if omit_input> AND stock.total_price < 0\n
                                  AND stock.uid = movement.uid\n
             </dtml-if>\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=24813&r1=24812&r2=24813&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Fri Dec  5 19:00:55 2008
@@ -1,1 +1,1 @@
-820
+821