[Erp5-report] r6381 - /erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_ac...

[nobody at svn.erp5.org]

Author: kevin
Date: Fri Mar 31 01:48:27 2006
New Revision: 6381

URL: http://svn.erp5.org?rev=6381&view=rev
Log:
  * Typo: source_payment_uid param doesn't exist, the right one is payment_uid.
  * Get the right specific_reference value.
  * Filter section by portal_type to break acquisition of 'group' property from Person to Organisation.

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml?rev=6381&r1=6380&r2=6381&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml Fri Mar 31 01:48:27 2006
@@ -269,13 +269,16 @@
   IF(stock.total_price > 0, stock.total_price, 0.0) AS debit,\n
   IF(stock.total_price < 0, - stock.total_price, 0.0) AS credit,\n
   stock.date AS date,\n
-  transaction.source_reference AS specific_reference,\n
+  IF(stock.section_uid = delivery.source_section_uid,\n
+       transaction.source_reference,\n
+       transaction.destination_reference) AS specific_reference,\n
   stock.total_price AS balance,\n
   stock.payment_uid AS payment_uid\n
 FROM\n
   catalog,\n
   catalog  AS transaction_line,\n
   catalog  AS transaction,\n
+  delivery,\n
   catalog  AS section_c,\n
   catalog  AS section_bc,\n
   category AS section_membership,\n
@@ -289,6 +292,7 @@
         AND stock.node_uid = <dtml-var getUid>\n
 \n
 WHERE stock.node_uid = <dtml-var getUid>\n
+  AND delivery.uid = transaction.uid\n
   AND transaction_line.uid = stock.uid\n
   AND transaction_line.portal_type <> \'Simulation Movement\'\n
   AND transaction_line.parent_uid = transaction.uid\n
@@ -316,10 +320,10 @@
 <dtml-if omit_output>\n
   AND stock.total_price > 0\n
 </dtml-if>\n
-<dtml-if source_payment_uid>\n
-  AND stock.payment_uid = <dtml-sqlvar source_payment_uid type="int">\n
-</dtml-if>\n
-<dtml-if no_source_payment_uid>\n
+<dtml-if payment_uid>\n
+  AND stock.payment_uid = <dtml-sqlvar payment_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_payment_uid>\n
   AND stock.payment_uid IS NULL\n
 </dtml-if>\n
 <dtml-if mirror_section_uid>\n
@@ -347,6 +351,7 @@
   AND section_membership.category_uid =  section_c.uid\n
   AND section_membership.base_category_uid = section_bc.uid\n
   AND section_membership.uid = section.uid\n
+  AND section.portal_type = \'Organisation\'\n
 <dtml-if where_expression>\n
   AND catalog.uid = category.uid\n
   AND <dtml-var where_expression>\n
@@ -407,13 +412,16 @@
   IF(stock.total_price > 0, stock.total_price, 0.0) AS debit,\n
   IF(stock.total_price < 0, - stock.total_price, 0.0) AS credit,\n
   stock.date AS date,\n
-  transaction.source_reference AS specific_reference,\n
+  IF(stock.section_uid = delivery.source_section_uid,\n
+       transaction.source_reference,\n
+       transaction.destination_reference) AS specific_reference,\n
   stock.total_price AS balance,\n
   stock.payment_uid AS payment_uid\n
 FROM\n
   catalog,\n
   catalog  AS transaction_line,\n
   catalog  AS transaction,\n
+  delivery,\n
   catalog  AS section_c,\n
   catalog  AS section_bc,\n
   category AS section_membership,\n
@@ -427,6 +435,7 @@
         AND stock.node_uid = <dtml-var getUid>\n
 \n
 WHERE stock.node_uid = <dtml-var getUid>\n
+  AND delivery.uid = transaction.uid\n
   AND transaction_line.uid = stock.uid\n
   AND transaction_line.portal_type <> \'Simulation Movement\'\n
   AND transaction_line.parent_uid = transaction.uid\n
@@ -454,10 +463,10 @@
 <dtml-if omit_output>\n
   AND stock.total_price > 0\n
 </dtml-if>\n
-<dtml-if source_payment_uid>\n
-  AND stock.payment_uid = <dtml-sqlvar source_payment_uid type="int">\n
-</dtml-if>\n
-<dtml-if no_source_payment_uid>\n
+<dtml-if payment_uid>\n
+  AND stock.payment_uid = <dtml-sqlvar payment_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_payment_uid>\n
   AND stock.payment_uid IS NULL\n
 </dtml-if>\n
 <dtml-if mirror_section_uid>\n
@@ -485,6 +494,7 @@
   AND section_membership.category_uid =  section_c.uid\n
   AND section_membership.base_category_uid = section_bc.uid\n
   AND section_membership.uid = section.uid\n
+  AND section.portal_type = \'Organisation\'\n
 <dtml-if where_expression>\n
   AND catalog.uid = category.uid\n
   AND <dtml-var where_expression>\n