Revert commit 15526, it was not ready for integration yet.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15549 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ZSQLMethods.SQL</string>
+          <string>SQL</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -161,23 +164,23 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>from_table_list</string>
-                            <string>where_expression</string>
-                            <string>order_by_expression</string>
-                            <string>group_by_expression</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>ignore_variation</string>
-                            <string>standardize</string>
-                            <string>omit_simulation</string>
-                            <string>section_filtered</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>input_simulation_state</string>
-                            <string>output_simulation_state</string>
-                            <string>precision</string>
-                            <string>inventory_list</string>
-                            <string>statistic</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_simulation</string>
+<string>section_filtered</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
+<string>precision</string>
+<string>inventory_list</string>
+<string>statistic</string>
                           </list>
                         </value>
                     </item>
@@ -250,13 +253,13 @@ statistic</string> </value>
             <key> <string>src</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<dtml-let join_with_catalog="omit_simulation or inventory_list or statistic">\n
-\n
 SELECT\n
 <dtml-if expr="precision is not None">\n
+  SUM(ROUND(stock.quantity, <dtml-var precision>)) AS inventory,\n
   SUM(ROUND(stock.quantity, <dtml-var precision>)) AS total_quantity,\n
   SUM(ROUND(stock.total_price, <dtml-var precision>)) AS total_price\n
 <dtml-else>\n
+  SUM(stock.quantity) AS inventory,\n
   SUM(stock.quantity) AS total_quantity,\n
   SUM(stock.total_price) AS total_price\n
 </dtml-if>\n
@@ -295,10 +298,8 @@ SELECT\n
 \n
 FROM\n
   stock\n
-  <dtml-if join_with_catalog>\n
-    <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> JOIN catalog AS section ON (section.uid = stock.section_uid)\n
-    , catalog as node, catalog as resource, catalog as catalog\n
-  </dtml-if>\n
+  <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if>  \n
+       JOIN catalog AS section ON (section.uid = stock.section_uid)\n
 <dtml-in prefix="table" expr="from_table_list"> \n
   <dtml-if expr="table_key != \'stock\'">\n
   , <dtml-var table_item> AS <dtml-var table_key>\n
@@ -306,6 +307,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -313,12 +315,11 @@ WHERE\n
   AND <dtml-var where_expression>\n
 </dtml-if>\n
 \n
-<dtml-if join_with_catalog>\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  <dtml-if omit_simulation>\n
+\n
+<dtml-if omit_simulation>\n
   AND catalog.portal_type != \'Simulation Movement\'\n
-  </dtml-if>\n
 </dtml-if>\n
 \n
 <dtml-if selection_domain>\n
@@ -335,7 +336,6 @@ GROUP BY\n
 ORDER BY\n
   <dtml-var order_by_expression>\n
 </dtml-if>\n
-</dtml-let>\n
 
 
 ]]></string> </value>
@@ -345,11 +345,9 @@ ORDER BY\n
             <value>
               <object>
                 <klass>
-                  <global name="__newobj__" module="copy_reg"/>
-                </klass>
-                <tuple>
                   <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </tuple>
+                </klass>
+                <none/>
                 <state>
                   <dictionary>
                     <item>
@@ -376,13 +374,13 @@ ORDER BY\n
                         <key> <string>raw</string> </key>
                         <value> <string encoding="cdata"><![CDATA[
 
-<dtml-let join_with_catalog="omit_simulation or inventory_list or statistic">\n
-\n
 SELECT\n
 <dtml-if expr="precision is not None">\n
+  SUM(ROUND(stock.quantity, <dtml-var precision>)) AS inventory,\n
   SUM(ROUND(stock.quantity, <dtml-var precision>)) AS total_quantity,\n
   SUM(ROUND(stock.total_price, <dtml-var precision>)) AS total_price\n
 <dtml-else>\n
+  SUM(stock.quantity) AS inventory,\n
   SUM(stock.quantity) AS total_quantity,\n
   SUM(stock.total_price) AS total_price\n
 </dtml-if>\n
@@ -421,10 +419,8 @@ SELECT\n
 \n
 FROM\n
   stock\n
-  <dtml-if join_with_catalog>\n
-    <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> JOIN catalog AS section ON (section.uid = stock.section_uid)\n
-    , catalog as node, catalog as resource, catalog as catalog\n
-  </dtml-if>\n
+  <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if>  \n
+       JOIN catalog AS section ON (section.uid = stock.section_uid)\n
 <dtml-in prefix="table" expr="from_table_list"> \n
   <dtml-if expr="table_key != \'stock\'">\n
   , <dtml-var table_item> AS <dtml-var table_key>\n
@@ -432,6 +428,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -439,12 +436,11 @@ WHERE\n
   AND <dtml-var where_expression>\n
 </dtml-if>\n
 \n
-<dtml-if join_with_catalog>\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  <dtml-if omit_simulation>\n
+\n
+<dtml-if omit_simulation>\n
   AND catalog.portal_type != \'Simulation Movement\'\n
-  </dtml-if>\n
 </dtml-if>\n
 \n
 <dtml-if selection_domain>\n
@@ -461,7 +457,6 @@ GROUP BY\n
 ORDER BY\n
   <dtml-var order_by_expression>\n
 </dtml-if>\n
-</dtml-let>\n
 
 
 ]]></string> </value>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ZSQLMethods.SQL</string>
+          <string>SQL</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -627,7 +630,9 @@ precision</string> </value>
         </item>
         <item>
             <key> <string>connection_hook</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
@@ -694,7 +699,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
-  , catalog as node, catalog as resource, catalog as catalog\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -704,7 +709,6 @@ WHERE\n
 \n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  AND catalog.uid = stock.uid\n
 \n
 <dtml-if omit_simulation>\n
   AND catalog.portal_type != \'Simulation Movement\'\n
@@ -779,11 +783,9 @@ ORDER BY\n
             <value>
               <object>
                 <klass>
-                  <global name="__newobj__" module="copy_reg"/>
-                </klass>
-                <tuple>
                   <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </tuple>
+                </klass>
+                <none/>
                 <state>
                   <dictionary>
                     <item>
@@ -855,7 +857,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
-  , catalog as node, catalog as resource, catalog as catalog\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -865,7 +867,6 @@ WHERE\n
 \n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  AND catalog.uid = stock.uid\n
 \n
 <dtml-if omit_simulation>\n
   AND catalog.portal_type != \'Simulation Movement\'\n

product/ERP5/bootstrap/erp5_core/bt/revision

-383
\ No newline at end of file
+384