take into account changes in the stock table.

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

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

@@ -184,8 +184,7 @@ group_by_expression</string> </value>
 SELECT\n
   SUM(stock.quantity) AS inventory,\n
   SUM(stock.quantity) AS total_quantity,\n
-  SUM(stock.price * stock.quantity) AS total_price,\n
-  AVG(stock.price) AS average_price,\n
+  SUM(stock.total_price) 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
@@ -322,8 +321,7 @@ GROUP BY\n
 SELECT\n
   SUM(stock.quantity) AS inventory,\n
   SUM(stock.quantity) AS total_quantity,\n
-  SUM(stock.price * stock.quantity) AS total_price,\n
-  AVG(stock.price) AS average_price,\n
+  SUM(stock.total_price) 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

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

@@ -222,8 +222,7 @@ output_simulation_state:list</string> </value>
 SELECT\n
   SUM(stock.quantity) AS inventory,\n
   SUM(stock.quantity) AS total_quantity,\n
-  SUM(stock.price * stock.quantity) AS total_price,\n
-  stock.price AS average_price,\n
+  SUM(stock.total_price) AS total_price,\n
   node.title AS node_title,\n
   node.relative_url AS node_relative_url,\n
   section.title AS section_title,\n
@@ -362,8 +361,7 @@ ORDER BY\n
 SELECT\n
   SUM(stock.quantity) AS inventory,\n
   SUM(stock.quantity) AS total_quantity,\n
-  SUM(stock.price * stock.quantity) AS total_price,\n
-  stock.price AS average_price,\n
+  SUM(stock.total_price) AS total_price,\n
   node.title AS node_title,\n
   node.relative_url AS node_relative_url,\n
   section.title AS section_title,\n