From 8e3a6f121feed6f8e432f19c55d937d56d06103b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 4 Feb 2010 13:28:57 +0530
Subject: [PATCH] [IMP] account,purchase: add the group by in search view

bzr revid: sbh@tinyerp.com-20100204075857-yrvbrbcmv1mixx2z
---
 addons/account/account_invoice_view.xml | 9 +++++++--
 addons/purchase/purchase_view.xml       | 5 +++++
 addons/report_sale/report_sale_view.xml | 7 ++++---
 addons/sale/sale_view.xml               | 4 ++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index a8de84f2cdc..e9ff1d1ddfc 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -327,7 +327,7 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
-                           <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
                         <filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
@@ -335,7 +335,12 @@
                         <field name="partner_id" select='1'/>
                         <field name="amount_total" string="Price" select='1'/>
                         <field name="origin" select='1'/>
-                   </group>
+ 					</group>                        
+                    <group expand="1" string="Group By..." colspan="4" col="10">
+                        <filter string="By Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/>
+						<filter string="By State" icon="terp-account" domain="[]"  context="{'group_by':'state'}"/>
+						<filter string="By Date Invoice" icon="terp-account" domain="[]" context="{'group_by':'date_invoice'}"/>
+                  	   </group>   
                </search>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4b6f184ebe2..b6598458190 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -161,6 +161,11 @@
                         <filter icon="terp-purchase" domain="[('create_uid','child_of',[uid])]" help="My Departments Purchase Orders"/>
                     </field>
                 </group>
+  				<group expand="1" string="Group By..." colspan="4" col="10">
+					<filter string="By Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
+					<filter string="By State" icon="terp-purchase" domain="[]"  context="{'group_by':'state'}"/>
+					<filter string="By Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
+				</group>                   
               </search>
             </field>
         </record>
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 9ba28966136..4a687a88169 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -64,12 +64,12 @@
 	                    <field name="month" select="1"/>
 	                    <field name="product_id" select="1"/>
 	                    <field name="state" select="1"/>
-                   		<group expand="1" string="Group By..." colspan="4" col="20">
+	                    </group>	 
+                   		<group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by':'name'}"/>
                         <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
-                    </group>	                    
                 	</group>
                 </search>
             </field>
@@ -151,13 +151,14 @@
 	                    <field name="month" select="1"/>
 	                    <field name="category_id" select="1"/>
 	                    <field name="state" select="1"/>
+						</group>	                    
                    		<group expand="1" string="Group By..." colspan="4" col="20">
                         <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by':'name'}"/>
                         <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Category" icon="terp-sale" domain="[]" context="{'group_by':'category_id'}"/>
 						</group>	                    
-					</group>
+					
                 </search>
             </field>
         </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7cfa650730d..e422d5656c9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -242,12 +242,12 @@
                             <filter icon="terp-sale" domain="[('user_id','child_of',[uid])]" help="My Departments Sale Orders"/>
                         </field>
                         <field name="date_order" select="1"/>
-                   		<group expand="1" string="Group By..." colspan="4" col="20">
+                        </group>
+                   		<group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="By Parnter" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
 						</group>                        
-                   </group>
                </search>
             </field>
         </record>