[Erp5-report] r6730 - /erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal...

[nobody at svn.erp5.org]

Author: kevin
Date: Fri Apr 14 23:36:46 2006
New Revision: 6730

URL: http://svn.erp5.org?rev=6730&view=rev
Log:
Delete my previous hack (I use where_expression now).
Addviolent rounding to do right accounting.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml?rev=6730&r1=6729&r2=6730&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml Fri Apr 14 23:36:46 2006
@@ -102,17 +102,6 @@
                                 </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>
                                   <dictionary/>
@@ -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 @@
 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 @@
             <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 @@
   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 @@
                         <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 @@
   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