From 9ef8ae2cef73fe4d1a745c40af1a0c783013dbbc Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 9 Jul 2010 15:08:56 +0530
Subject: [PATCH] [IMP]:sale,purchase:imroved SQL reports

bzr revid: apa@tinyerp.com-20100709093856-jqgcv6m4e8usswr1
---
 addons/purchase/report/purchase_report.py       |  4 ++--
 addons/purchase/report/purchase_report_view.xml | 12 ++++++------
 addons/sale/report/sale_report_view.xml         |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 4f5abfe698d..7de197cf07e 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -58,10 +58,10 @@ class purchase_report(osv.osv):
         'delay_pass':fields.float('Days to Deliver', digits=(16,2), readonly=True, group_operator="avg"),
         'quantity': fields.float('# of Products', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
-        'price_average': fields.float('Unit Price', readonly=True, group_operator="avg"),
+        'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
         'negociation': fields.float('Purchase-Standard Price', readonly=True, group_operator="avg"),
         'price_standard': fields.float('Products Value', readonly=True, group_operator="sum"),
-        'nbr': fields.integer('# of PO Lines', readonly=True),
+        'nbr': fields.integer('# of Lines', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
 
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 757fc065a60..c8d88503b46 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -33,14 +33,14 @@
                     <field name="company_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="location_id" invisible="1"/>
-                    <field name="nbr"/>
+                    <field name="nbr" sum="# of Lines"/>
                     <field name="quantity" sum="# of Products"/>
-                    <field name="price_average" avg="Average Price"/>
+                    <field name="price_average" sum="Average Price"/>
                     <field name="price_total" sum="Total Price"/>
-                    <field name="price_standard" sum="Products Costs"/>
+                    <field name="price_standard" sum="Products Value"/>
                     <field name="negociation" widget="progressbar"/>
-                    <field name="delay"/>
-                    <field name="delay_pass"/>
+                    <field name="delay" avg="Days to Validate"/>
+                    <field name="delay_pass" avg="Days to Deliver"/>
                 </tree>
             </field>
         </record>
@@ -142,7 +142,7 @@
 
 
     <record id="action_purchase_order_report_all" model="ir.actions.act_window">
-        <field name="name">Purchase Orders</field>
+        <field name="name">Purchase Analysis</field>
         <field name="res_model">purchase.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 6ab414aad8b..8ab66e79a5f 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -122,6 +122,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_order_product_search"/>
+        <field name="view_id" ref="view_order_product_tree"/>
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
     </record>