[Erp5-report] r19273 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 12 15:47:44 CET 2008
Author: yusei
Date: Tue Feb 12 15:47:43 2008
New Revision: 19273
URL: http://svn.erp5.org?rev=19273&view=rev
Log:
2008-2-12 yusei
* Fixed amount search bug.
(I did not remove movement table for the present.)
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/bt/change_log
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=19273&r1=19272&r2=19273&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml Tue Feb 12 15:47:43 2008
@@ -439,6 +439,7 @@
<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\',), **selection_params)">\n
<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
+<dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n
\n
\n
<dtml-comment>\n
@@ -635,11 +636,9 @@
SELECT COUNT(DISTINCT uid) AS count FROM (\n
<dtml-else>\n
SELECT catalog.*,\n
- <dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n
( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n
( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n
FROM (\n
- </dtml-let>\n
</dtml-if>\n
\n
<dtml-comment>\n
@@ -716,14 +715,20 @@
</dtml-if>\n
<dtml-if transaction_uid>\n
AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
- <dtml-if amount>\n
- AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_min>\n
- AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_max>\n
- AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n
+ <dtml-if "amount or amount_range_min or amount_range_max">\n
+ AND EXISTS\n
+ (SELECT * FROM stock, catalog as child WHERE\n
+ stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
+ <dtml-if amount>\n
+ AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n
+ </dtml-if>\n
+ <dtml-if amount_range_min>\n
+ AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n
+ </dtml-if>\n
+ <dtml-if amount_range_max>\n
+ AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n
+ </dtml-if>\n
+ )\n
</dtml-if>\n
<dtml-if creation_date_range_min>\n
AND catalog.creation_date >=\n
@@ -899,14 +904,20 @@
</dtml-if>\n
<dtml-if transaction_uid>\n
AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
- <dtml-if amount>\n
- AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_min>\n
- AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_max>\n
- AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n
+ <dtml-if "amount or amount_range_min or amount_range_max">\n
+ AND EXISTS\n
+ (SELECT * FROM stock, catalog as child WHERE\n
+ stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
+ <dtml-if amount>\n
+ AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n
+ </dtml-if>\n
+ <dtml-if amount_range_min>\n
+ AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n
+ </dtml-if>\n
+ <dtml-if amount_range_max>\n
+ AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n
+ </dtml-if>\n
+ )\n
</dtml-if>\n
<dtml-if creation_date_range_min>\n
AND catalog.creation_date >=\n
@@ -1036,7 +1047,7 @@
\n
\n
\n
-</dtml-let></dtml-let></dtml-let>\n
+</dtml-let></dtml-let></dtml-let></dtml-let>\n
\n
<dtml-comment> vim: syntax=dtml\n
</dtml-comment>\n
@@ -1083,6 +1094,7 @@
<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\',), **selection_params)">\n
<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
+<dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n
\n
\n
<dtml-comment>\n
@@ -1279,11 +1291,9 @@
SELECT COUNT(DISTINCT uid) AS count FROM (\n
<dtml-else>\n
SELECT catalog.*,\n
- <dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n
( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n
( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n
FROM (\n
- </dtml-let>\n
</dtml-if>\n
\n
<dtml-comment>\n
@@ -1360,14 +1370,20 @@
</dtml-if>\n
<dtml-if transaction_uid>\n
AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
- <dtml-if amount>\n
- AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_min>\n
- AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_max>\n
- AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n
+ <dtml-if "amount or amount_range_min or amount_range_max">\n
+ AND EXISTS\n
+ (SELECT * FROM stock, catalog as child WHERE\n
+ stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
+ <dtml-if amount>\n
+ AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n
+ </dtml-if>\n
+ <dtml-if amount_range_min>\n
+ AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n
+ </dtml-if>\n
+ <dtml-if amount_range_max>\n
+ AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n
+ </dtml-if>\n
+ )\n
</dtml-if>\n
<dtml-if creation_date_range_min>\n
AND catalog.creation_date >=\n
@@ -1543,14 +1559,20 @@
</dtml-if>\n
<dtml-if transaction_uid>\n
AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
- <dtml-if amount>\n
- AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_min>\n
- AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_max>\n
- AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n
+ <dtml-if "amount or amount_range_min or amount_range_max">\n
+ AND EXISTS\n
+ (SELECT * FROM stock, catalog as child WHERE\n
+ stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
+ <dtml-if amount>\n
+ AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n
+ </dtml-if>\n
+ <dtml-if amount_range_min>\n
+ AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n
+ </dtml-if>\n
+ <dtml-if amount_range_max>\n
+ AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n
+ </dtml-if>\n
+ )\n
</dtml-if>\n
<dtml-if creation_date_range_min>\n
AND catalog.creation_date >=\n
@@ -1680,7 +1702,7 @@
\n
\n
\n
-</dtml-let></dtml-let></dtml-let>\n
+</dtml-let></dtml-let></dtml-let></dtml-let>\n
\n
<dtml-comment> vim: syntax=dtml\n
</dtml-comment>\n
Modified: erp5/trunk/bt5/erp5_accounting/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/change_log?rev=19273&r1=19272&r2=19273&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/change_log Tue Feb 12 15:47:43 2008
@@ -1,3 +1,6 @@
+2008-2-12 yusei
+* Fixed amount search bug.
+
2008-2-7 yusei
* Fixed filtering bug on accounting module list view when jump in from entity.
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=19273&r1=19272&r2=19273&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Feb 12 15:47:43 2008
@@ -1,1 +1,1 @@
-599
+600
More information about the Erp5-report
mailing list