diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml index 036d130025a2c71ac2ecfd5e952cbf8d7b2dfb84..285c3aa437bce0519fbd9dc472b3ce2f02869116 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml +++ b/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 diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml index e8b12e746ec1fb9b8272ac173e913483b18c61a5..541bca9342fae3a59fb153b9310325846ca93232 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml +++ b/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