From abe39cab3c8519b5d2afbd2011ad3109d3af7366 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 30 Jul 2010 16:23:44 +0530
Subject: [PATCH] [MOD] crm_lead,crm_opportunity : Group by set above the
 extended filter option in search view

bzr revid: vir@tinyerp.com-20100730105344-qu7lzwf9cqo0g5mv
---
 addons/crm/crm_lead_view.xml        | 28 ++++++++++++++--------------
 addons/crm/crm_opportunity_view.xml | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 14a23bd6a18..709178a2cc3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -317,20 +317,6 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group  expand="0" string="Extended options..." groups="base.group_extended">
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <separator orientation="vertical"/>
-                      <field name="country_id" context="{'invisible_country': False}">
-                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                      </field>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="create_date" string="Creation Date"/>
-                      <field name="date_closed"/>
-                </group>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -343,6 +329,20 @@
                     <filter string="Creation" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
+                <newline/>
+                <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <separator orientation="vertical"/>
+                      <field name="country_id" context="{'invisible_country': False}">
+                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="create_date" string="Creation Date"/>
+                      <field name="date_closed"/>
+                </group>
            </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 0ab4529b75f..ca094469c69 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -309,20 +309,6 @@
                                 help="Show Sales Team"/>
                         </field>
                         <newline/>
-                        <group  expand="0" string="Extended options..." groups="base.group_extended">
-                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <separator orientation="vertical"/>
-                              <field name="country_id" context="{'invisible_country': False}">
-                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                              </field>
-                              <separator orientation="vertical"/>
-                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                              <newline/>
-                              <field name="create_date" string="Creation Date"/>
-                              <field name="date_closed"/>
-                        </group>
-                        <newline/>
                         <group expand="0" string="Group By..." colspan="16">
                             <filter string="Stage" icon="terp-stage" domain="[]"
                                 context="{'group_by':'stage_id'}" />
@@ -345,6 +331,20 @@
                                 help="Expected Closing" domain="[]"
                                 context="{'group_by':'date_deadline'}" />
                         </group>
+                        <newline/>
+                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <separator orientation="vertical"/>
+                              <field name="country_id" context="{'invisible_country': False}">
+                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                              </field>
+                              <separator orientation="vertical"/>
+                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                              <newline/>
+                              <field name="create_date" string="Creation Date"/>
+                              <field name="date_closed"/>
+                        </group>
                     </search>
                 </field>
             </record>