From 40e34eb66ea1bd44a9480fbac348350a83edba27 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 22 Apr 2010 15:39:10 +0530
Subject: [PATCH] [IMP]: Improve sale report search view.

bzr revid: rch_open_erp-20100422100910-5e6qqo5f0qmdxvmb
---
 addons/sale/report/sale_report.py       | 22 ++++++++++++++++++++--
 addons/sale/report/sale_report_view.xml | 21 +++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index d1081a4b21f..0372de7ce42 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -57,6 +57,12 @@ class sale_report(osv.osv):
             ('done', 'Done'),
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True),
+        'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True),
+        'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True),
+        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'date_confirm': fields.date('Confirmation Date', readonly=True)
     }
     _order = 'date desc'
     def init(self, cr):
@@ -81,7 +87,13 @@ class sale_report(osv.osv):
                      sum(l.product_uom_qty*l.price_unit) as price_total,
                      (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
                      count(*) as nbr,
-                     s.state
+                     s.state,
+                     s.partner_invoice_id as partner_invoice_id,
+                     s.partner_order_id as partner_order_id,
+                     s.partner_shipping_id as partner_shipping_id,
+                     s.pricelist_id as pricelist_id,
+                     s.project_id as analytic_account_id,
+                     s.date_confirm as date_confirm
                      from
                  sale_order_line l
                  left join
@@ -97,7 +109,13 @@ class sale_report(osv.osv):
                      s.shop_id,
                      s.company_id,
                      s.fiscal_position,
-                     s.payment_term
+                     s.payment_term,
+                     s.partner_invoice_id,
+                     s.partner_order_id,
+                     s.partner_shipping_id,
+                     s.pricelist_id,
+                     s.project_id,
+                     s.date_confirm
             )
         """)
 sale_report()
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 73029cb88fa..41fe598b597 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -24,6 +24,12 @@
                 <field name="state" invisible="1"/>
                 <field name="fiscal_position" invisible="1"/>
                 <field name="payment_term" invisible="1"/>
+                <field name="partner_invoice_id" invisible="1"/>
+                <field name="partner_order_id" invisible="1"/>
+                <field name="partner_shipping_id" invisible="1"/>
+                <field name="pricelist_id" invisible="1"/>
+                <field name="analytic_account_id" invisible="1"/>
+                <field name="date_confirm" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -97,8 +103,16 @@
                     <filter icon="terp-sale" string="Done" domain="[('state','=','done')]"/>
                     <filter icon="terp-sale" string="Cancelled" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
+                    <field name="partner_invoice_id"/>
+                    <field name="partner_order_id"/>
+                    <field name="partner_shipping_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="pricelist_id" widget="selection"/>
+                    <field name="analytic_account_id"/>
+                    <newline/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="date"/>
+                    <field name="date_confirm"/>
                 </group>
                 <newline/>
                 <newline/>
@@ -112,6 +126,13 @@
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
                     <filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
                     <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
+                    <newline/>
+                    <filter string="Invoice Address" icon="terp-sale" context="{'group_by':'partner_invoice_id'}"/>
+                    <filter string="Ordering Contact" icon="terp-sale" context="{'group_by':'partner_order_id'}"/>
+                    <filter string="Shipping Address" icon="terp-sale" context="{'group_by':'partner_shipping_id'}"/>
                     <separator orientation="vertical"/>
 					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>