From 6652e6b0eb382c0bbb449c12d62b5e5a89586b51 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 27 Sep 2010 13:11:24 +0530
Subject: [PATCH] [IMP/MOD]
 mrp,point_of_sale,product,project,project_issue,purchase,sale,sale_margin * :
 Extended filter option set before group by in search view

bzr revid: vir@tinyerp.com-20100927074124-j4waeanwhbhvb0kn
---
 .../mrp/report/mrp_production_order_view.xml  | 31 ++++++-----
 .../report/report_cash_register_view.xml      |  2 +-
 .../report/report_pos_order_view.xml          | 12 ++---
 addons/product/product_view.xml               |  9 ++--
 addons/project/report/project_report_view.xml | 22 ++++----
 .../report/project_issue_report_view.xml      | 35 ++++++------
 .../purchase/report/purchase_report_view.xml  | 28 +++++-----
 addons/sale/report/sale_report_view.xml       | 22 ++++----
 .../sale_margin/report/report_margin_view.xml | 53 ++++++++++---------
 9 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index efacd8b675d..ea1f15bc3ea 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -69,8 +69,21 @@
                         <field name="location_dest_id" />
                    </group>
                    <newline/>
-
-                   <group expand="0" string="Group By...">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
+                        <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
+                        <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
+                        <separator orientation="vertical"/>
+                      <field name="priority"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" groups="base.group_multi_company"/>
+                      <newline/>
+                        <field name="date_start"/>
+                      <field name="date_planned"/>
+                      <field name="date_finnished"/>
+                    </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                     	<filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
                     	<filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
                     	<separator orientation="vertical"/>
@@ -87,20 +100,6 @@
                     	<separator orientation="vertical"/>
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
-                    <newline/>
-	                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-	                    <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
-	                    <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
-	                    <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
-	                    <separator orientation="vertical"/>
-                      <field name="priority"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" groups="base.group_multi_company"/>
-                      <newline/>
-	                    <field name="date_start"/>
-                      <field name="date_planned"/>
-                      <field name="date_finnished"/>
-	                </group>
                   </search>
             </field>
         </record>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 3cda047598f..fb498336fb5 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -61,7 +61,7 @@
                         </field>
                     </group>  
                     <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="12">
+	                <group expand="1" string="Group By..." colspan="10" col="12">
 	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
 	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index 6a9bc6823cc..b149ebf3fb8 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -73,7 +73,12 @@
                     </field>
 	                </group>
 	                <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="date_validation"/>
+                        <field name="date_payment"/>
+                    </group>
+	                <newline/>
+	                <group expand="1" string="Group By..." colspan="10" col="12">
 	                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
 	                    <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
 	                    <separator orientation="vertical"/>
@@ -83,11 +88,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of order date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of order date"/>
 	                </group>
-	                <newline/>
-	                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="date_validation"/>
-                        <field name="date_payment"/>
-                    </group>
 	            </search>
 	        </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1d40945f2f8..45ebaa8ee57 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -21,6 +21,10 @@
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
+                   </group>
+                   <newline/>
                    <group  expand='0' string='Group by...' groups="base.group_extended">
                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
@@ -28,10 +32,7 @@
                        <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
-                   <newline/>
-                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
-                   </group>
+                   
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9db500d93ff..f269399877c 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -107,6 +107,17 @@
                       <field name="partner_id" />
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                        <field name="type_id" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_deadline"/>
+                        <field name="date_end"/>
+                        <separator orientation="vertical"/>
+                        <field name="priority"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
                         <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
@@ -122,17 +133,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
-                    <newline/>
-	                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-	                    <field name="type_id" widget="selection"/>
-	                    <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <field name="date_deadline"/>
-                        <field name="date_end"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="priority"/>
-	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c80ccc86e28..9ceded378ba 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -90,6 +90,23 @@
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
+                   <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                       <field name="partner_id"/>
+                       <field name="assigned_to" widget="selection"/>
+                       <separator orientation="vertical"/>
+                       <field name="priority" />
+                       <separator orientation="vertical"/>
+                       <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                       <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
+                       <separator orientation="vertical"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <newline/>
+                       <field name="creation_date"/>
+                       <field name="opening_date"/>
+                       <field name="date_closed" string="Date Closed"/>
+                   </group>
+                   <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
@@ -129,23 +146,7 @@
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-                    		<field name="partner_id"/>
-                    		<field name="assigned_to" widget="selection"/>
-                    		<separator orientation="vertical"/>
-                    		<field name="priority" />
-                    		<separator orientation="vertical"/>
-                    		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
-                    		<separator orientation="vertical"/>
-                   		<field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    		<newline/>
-                            <field name="creation_date"/>
-                            <field name="opening_date"/>
-                            <field name="date_closed" string="Date Closed"/>
-                        </group>
+
                </search>
             </field>
         </record>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index bd69e4dfce0..b8831ed11e0 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -78,6 +78,20 @@
                 <field name="product_id"/>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
+                    <field name="user_id"/>
+                    <field name="validator"/>
+                    <separator orientation="vertical"/>
+                    <field name="location_id"/>
+                    <field name="warehouse_id" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_approve"/>
+                    <field name="expected_date"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -96,20 +110,6 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
-                    <field name="user_id"/>
-                    <field name="validator"/>
-                    <separator orientation="vertical"/>
-                    <field name="location_id"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_approve"/>
-                    <field name="expected_date"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 36b1afee891..f1ff0e17ca6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -85,6 +85,15 @@
                     </field>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="date"/>
+                    <field name="date_confirm"/>
+                    <separator orientation="vertical"/>
+                    <field name="shop_id" widget="selection"/>
+                    <field name="categ_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
@@ -99,19 +108,10 @@
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                    <separator orientation="vertical"/>
-                    <field name="shop_id" widget="selection"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
index 31616ff96fe..8c0aaa05d8c 100644
--- a/addons/sale_margin/report/report_margin_view.xml
+++ b/addons/sale_margin/report/report_margin_view.xml
@@ -32,35 +32,38 @@
             <field name="arch" type="xml">
                 <search string="Search Margin">
                     <group col="10" colspan="4">
-						<filter icon="terp-account" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
-						<filter icon="terp-account" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
-						<filter string="Draft" icon="terp-account" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                   		<filter string="Pro-forma" icon="terp-account" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
-                   		<filter string="Current" icon="terp-account" domain="[('state', '=' ,'open')]" help="open Invoices"/>
-	                	<filter string="Done" icon="terp-account" domain="[('state','=','paid')]" help="Done Invoices"/>
+						<filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
+						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
+						<separator orientation="vertical"/>
+						<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                   		<filter string="Pro-forma" icon="terp-check" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
+                   		<filter string="Current" icon="terp-check" domain="[('state', '=' ,'open')]" help="open Invoices"/>
+	                	<filter string="Done" icon="terp-dialog-close" domain="[('state','=','paid')]" help="Done Invoices"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="date" string="Date Invoiced"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="amount" />
+                        <field name="state"/>
+                        <newline/>
+                        <field name="product_id"/>
+                        <field name="categ_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-	                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-	                    <filter string="Category" icon="terp-account" context="{'group_by':'categ_id'}"/>
- 						<filter string="State" icon="terp-account" context="{'group_by':'state'}"/>	
-	                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-    	                <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-        	            <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/> 						                    
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+	                    <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+ 						<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ 						<separator orientation="vertical"/>
+	                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+    	                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+        	            <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
-                     <newline/>
-	    			<group expand="0" string="Extended Filters..." groups="base.group_extended">
-	                    <field name="date" string="Date Invoiced"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="partner_id" widget="selection"/>
-	                    <field name="amount" />
-	                    <field name="state"/>
-	                    <newline/>
-	                    <separator orientation="vertical"/>
-	                	<field name="product_id"/>
-	                	<field name="categ_id"/>
-	                </group>                    
                 </search>
             </field>
         </record>