Commit a73676a2 authored by Kevin Deldycke's avatar Kevin Deldycke

Delete my previous hack (I use where_expression now).

Addviolent rounding to do right accounting.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6730 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 71ec3864
......@@ -101,17 +101,6 @@
</dictionary>
</value>
</item>
<item>
<key> <string>section_portal_type_list</string> </key>
<value>
<dictionary>
<item>
<key> <string>type</string> </key>
<value> <string>list</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>selection_domain</string> </key>
<value>
......@@ -148,7 +137,6 @@
<string>order_by_expression</string>
<string>selection_domain</string>
<string>selection_report</string>
<string>section_portal_type_list</string>
<string>ignore_variation</string>
<string>standardize</string>
<string>omit_simulation</string>
......@@ -172,7 +160,6 @@ where_expression\r\n
order_by_expression\r\n
selection_domain\r\n
selection_report\r\n
section_portal_type_list:list\r\n
ignore_variation\r\n
standardize\r\n
omit_simulation\r\n
......@@ -195,9 +182,9 @@ group_by_expression</string> </value>
<value> <string encoding="cdata"><![CDATA[
SELECT\n
SUM(stock.quantity) AS inventory,\n
SUM(stock.quantity) AS total_quantity,\n
SUM(stock.total_price) AS total_price,\n
SUM(ROUND(stock.quantity,2)) AS inventory,\n
SUM(ROUND(stock.quantity,2)) AS total_quantity,\n
SUM(ROUND(stock.total_price,2)) AS total_price,\n
COUNT(DISTINCT node.title) AS node_title,\n
COUNT(DISTINCT node.relative_url) AS node_relative_url,\n
COUNT(DISTINCT section.title) AS section_title,\n
......@@ -283,14 +270,6 @@ XXX How to deal with standardize ?\n
AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
</dtml-if>\n
\n
<dtml-comment>\n
This addition is here to help us break acquisition of \'group\' property from Person to Organisation.\n
The latter behaviour break accounting calculations.\n
</dtml-comment>\n
<dtml-if section_portal_type_list>\n
AND (<dtml-in section_portal_type_list>section.portal_type = \'<dtml-var sequence-item>\'<dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
</dtml-if>\n
\n
<dtml-if group_by_expression>\n
GROUP BY <dtml-var group_by_expression>\n
</dtml-if>\n
......@@ -338,9 +317,9 @@ ORDER BY\n
<value> <string encoding="cdata"><![CDATA[
SELECT\n
SUM(stock.quantity) AS inventory,\n
SUM(stock.quantity) AS total_quantity,\n
SUM(stock.total_price) AS total_price,\n
SUM(ROUND(stock.quantity,2)) AS inventory,\n
SUM(ROUND(stock.quantity,2)) AS total_quantity,\n
SUM(ROUND(stock.total_price,2)) AS total_price,\n
COUNT(DISTINCT node.title) AS node_title,\n
COUNT(DISTINCT node.relative_url) AS node_relative_url,\n
COUNT(DISTINCT section.title) AS section_title,\n
......@@ -426,14 +405,6 @@ XXX How to deal with standardize ?\n
AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
</dtml-if>\n
\n
<dtml-comment>\n
This addition is here to help us break acquisition of \'group\' property from Person to Organisation.\n
The latter behaviour break accounting calculations.\n
</dtml-comment>\n
<dtml-if section_portal_type_list>\n
AND (<dtml-in section_portal_type_list>section.portal_type = \'<dtml-var sequence-item>\'<dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
</dtml-if>\n
\n
<dtml-if group_by_expression>\n
GROUP BY <dtml-var group_by_expression>\n
</dtml-if>\n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment