From da53f2831ebd7122a50df9258b9583b90a97f06d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 30 Apr 2010 16:25:01 +0530
Subject: [PATCH] [IMP]:purchase:improved search view..(Purchase Order).

bzr revid: apa@tinyerp.com-20100430105501-bkxd2hifzinkbrkl
---
 addons/purchase/report/purchase_report.py     | 18 +++++++++
 .../purchase/report/purchase_report_view.xml  | 38 +++++++++++++++----
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 76d018680d2..d6fd4000633 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -54,6 +54,12 @@ class purchase_report(osv.osv):
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'partner_address_id':fields.many2one('res.partner.address', 'Address', readonly=True),
+        'dest_address_id':fields.many2one('res.partner.address', 'Dest. Address',readonly=True),
+        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
+        'date_approve':fields.date('Date Approved', readonly=True),
+        'expected_date':fields.date('Expected Date', readonly=True),
+        'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'quantity': fields.float('# of Products', readonly=True),
@@ -76,6 +82,12 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'MM') as month,
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                     s.state,
+                    s.date_approve,
+                    date_trunc('day',s.minimum_planned_date) as expected_date,
+                    s.partner_address_id,
+                    s.dest_address_id,
+                    s.pricelist_id,
+                    s.validator,
                     s.warehouse_id as warehouse_id,
                     s.partner_id as partner_id,
                     s.fiscal_position,
@@ -97,6 +109,12 @@ class purchase_report(osv.osv):
                     s.create_uid,
                     s.partner_id,
                     s.location_id,
+                    s.date_approve,
+                    date_trunc('day',s.minimum_planned_date),
+                    s.partner_address_id,
+                    s.pricelist_id,
+                    s.validator,
+                    s.dest_address_id,
                     l.product_id,
                     s.date_order,
                     to_char(s.date_order, 'YYYY'),
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 93918160bd1..8f3f31e84ee 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -21,6 +21,8 @@
             <field name="arch" type="xml">
                 <tree string="Purchase Orders Statistics">
                 	<field name="date" invisible="1"/>
+                	<field name="date_approve" invisible="1"/>
+                	<field name="expected_date" invisible="1"/>
                 	<field name="user_id" invisible="1"/>
                 	<field name="partner_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
@@ -32,6 +34,10 @@
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="warehouse_id" invisible="1"/>
+                    <field name="partner_address_id" invisible="1"/>
+                    <field name="dest_address_id" invisible="1"/>
+                    <field name="pricelist_id" invisible="1"/>
+                    <field name="validator" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="location_id" invisible="1"/>
@@ -71,6 +77,8 @@
                 		domain="[('state','=','manual')]"/>
 
                 <separator orientation="vertical"/>
+                <field name="partner_id" string="Supplier"/>
+                <field name="product_id"/>
                 <field name="user_id" widget="selection">
                     <filter icon="terp-purchase"
                     		string="My Purchaes"
@@ -81,35 +89,49 @@
                     		help="Purchase Non User"
                     		domain="[('user_id','=',False)]"/>
                 </field>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
+                    <field name="date_approve"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_address_id"/>
                     <field name="invoice_method"/>
                     <field name="warehouse_id" widget="selection"/>
-                    <field name="location_id" widget="selection"/>
+                    <field name="validator" widget="selection"/>
+
                     <newline/>
                     <filter icon="terp-purchase" string="Invoice Exception  " domain="[('state','=','invoice_except')]"/>
                     <filter icon="terp-purchase" string="Cancel" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
+                    <field name="expected_date"/>
+                    <separator orientation="vertical"/>
+                    <field name="dest_address_id"/>
                     <field name="fiscal_position" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="date"/>
+                    <field name="location_id" widget="selection"/>
+                    <field name="pricelist_id" widget="selection"/>
+
+ 					<newline/>
+					<field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Address" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
+                    <filter string="Dest. Address" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
                     <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
-                    <filter string="Partner" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
                     <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
                     <separator orientation="vertical"/>