[IMP/MOD] stock : Extended filter option set before group by in search view

bzr revid: vir@tinyerp.com-20100927093434-wsi78oq4vnsm4pg3

3 files changed, 38 insertions, 41 deletions

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 2c8c1ad80e9..efbaaa12625 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -86,6 +86,15 @@
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                    <field name="location_id" widget = "selection"/>
+                    <field name="location_dest_id"  widget = "selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date_planned"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -102,16 +111,6 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
                     <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="location_id" widget = "selection"/>
-                    <field name="location_dest_id"  widget = "selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_planned"/>
-                </group>
-
             </search>
         </field>
     </record>
@@ -187,7 +186,13 @@
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-
+                <newline/>
+                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="prodlot_id"/>
+                    <field name="state"/>
+                    <field name="location_type"/>
+                </group>
                 <newline/>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -200,13 +205,6 @@
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="partner_id" context="{'contact_display':'partner'}"/>
-                    <field name="prodlot_id"/>
-                    <field name="state"/>
-                    <field name="location_type"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 13cdd624cf2..edbd9e66b7d 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -73,6 +73,20 @@
                         <field name="partner_id"/>
                    </group>
                    <newline/>
+                	<group expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="product_id"/>
+                      <separator orientation="vertical"/>
+                      <field name="type"/>
+	                    <field name="invoice_state"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+	                    <newline/>
+	                    <field name="order_date"/>
+	                    <field name="date_done"/>
+                      <field name="min_date"/>
+                      <field name="max_date"/>
+                	</group>
+                   <newline/>
                    <group expand="1" string="Group By...">
                         <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
@@ -89,21 +103,6 @@
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                     </group>
-                    <newline/>
-                	<group expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="product_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="type"/>
-	                    <field name="invoice_state"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                    <newline/>
-	                    <field name="order_date"/>
-	                    <field name="date_done"/>
-                      <field name="min_date"/>
-                      <field name="max_date"/>
-                	</group>
-
                </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f9fd2ed2bd2..e80e9856023 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1598,6 +1598,14 @@
                         <field name="date_planned"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
+                            <field name="origin"/>
+                            <field name="picking_id"/>
+                            <field name="prodlot_id"/>
+                            <field name="tracking_id"/>
+                            <field name="state"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
@@ -1612,14 +1620,6 @@
                         <filter string="Creation" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                         <filter string="Expected" name="groupby_date_planned" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
-                            <field name="origin"/>
-                            <field name="picking_id"/>
-                            <field name="prodlot_id"/>
-                            <field name="tracking_id"/>
-                            <field name="state"/>
-                    </group>
                 </search>
             </field>
         </record>