diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index 32e77be341f..6553d761a01 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -57,22 +57,22 @@
                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
+                    <filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
+                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
+                    <filter string="Internal Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="Account Type" icon="terp-account" context="{'group_by':'user_type'}"/>
+                    <filter string="Parent Account" icon="terp-account" context="{'group_by':'parent_account_id'}"/>
+                </group>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
                     <field name="type" />
                     <field name="user_type" widget="selection"/>
                     <field name="parent_account_id" />
                 </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                	<filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
-                	<filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
-                	<filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                	<separator orientation="vertical"/>
-                	<filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
-                    <filter string="Internal Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'user_type'}"/>
-                    <filter string="Parent Account" icon="terp-account" context="{'group_by':'parent_account_id'}"/>
-                </group>
+
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 41d9c0976f2..b824ebcf7c3 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -55,16 +55,6 @@
 	                <field name="currency_id"/>
 	            </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-					<field name="account_id" />
-					<field name="general_account_id" widget="selection"/>
-					<field name="journal_id" widget="selection"/>
-					<separator orientation="vertical"/>
-					<field name="product_id" />
-					<field name="product_uom_id" widget="selection"/>
-            <field name="company_id" widget="selection" groups="base.multi_company"/>
-        		</group>
-        		<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
@@ -81,6 +71,16 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+					<field name="account_id" />
+					<field name="general_account_id" widget="selection"/>
+					<field name="journal_id" widget="selection"/>
+					<separator orientation="vertical"/>
+					<field name="product_id" />
+					<field name="product_uom_id" widget="selection"/>
+            <field name="company_id" widget="selection" groups="base.multi_company"/>
+        		</group>
+
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index c6308ec9928..625d98fa9cb 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -74,25 +74,6 @@
                         <field name="partner_id" />
 					</group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter string="Posted"
-                   			icon="terp-account"
-                   			domain="[('state','=','posted')]"
-                   			help = "Posted tasks"/>
-                		<field name="state_2"/>
-                	<separator orientation="vertical"/>
-                		<field name="period_id" widget="selection"/>
-                		<field name="period_id2" widget="selection"/>
-                		<field name="type"/>
-                    <field name="product_id" />
-                    <field name="analytic_account_id"/>
-                    <newline/>
-                	<separator orientation="vertical"/>
-                    <field name="date_created"/>
-                		<field name="date"/>
-                    <field name="date_maturity"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
@@ -111,6 +92,25 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                  </group>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                	<filter string="Posted"
+                   			icon="terp-account"
+                   			domain="[('state','=','posted')]"
+                   			help = "Posted tasks"/>
+                		<field name="state_2"/>
+                	<separator orientation="vertical"/>
+                		<field name="period_id" widget="selection"/>
+                		<field name="period_id2" widget="selection"/>
+                		<field name="type"/>
+                    <field name="product_id" />
+                    <field name="analytic_account_id"/>
+                    <newline/>
+                	<separator orientation="vertical"/>
+                    <field name="date_created"/>
+                		<field name="date"/>
+                    <field name="date_maturity"/>
+                </group>
+
             </search>
         </field>
     </record>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 2a005e51202..c596ffc261e 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -108,7 +108,14 @@
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
                    <newline/>
-					<group expand="0" string="Group By...">
+					<group expand="1" string="Group By..." colspan="16">
+						<filter string="Type" icon="terp-project" help="Invitation Type"
+					        domain="[]" context="{'group_by':'cutype'}" />
+					    <filter string="Role" icon="terp-project"
+					        domain="[]" context="{'group_by':'role'}" />
+					    <filter string="Required Reply" icon="terp-crm"
+					        domain="[]" context="{'group_by':'rsvp'}" />
+					    <separator orientation="vertical" />
 					    <filter string="User" icon="terp-partner" domain="[]"
 					        context="{'group_by':'user_id'}" />
 					    <filter string="Contact" icon="terp-partner" domain="[]"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3fbca9d5595..ab8bc1de303 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -306,7 +306,7 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="14">
+                <group expand="1" string="Group By..." colspan="14">
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index a89655b503c..dca6e6e20f6 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -60,22 +60,8 @@
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Leaves during last 7 days"/>
 		                <separator orientation="vertical"/>
-<<<<<<< TREE
-						<field name="employee_id"/>
-		                <field name="user_id" widget="selection">
-		                    <filter icon="terp-hr"
-		                        string="My Leaves"
-		                        domain="[('user_id','=',uid)]"/>
-		                </field>
-		            </group>
-		            <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
-	                    <field name="holiday_status_id" widget="selection"/>
-	                	<field name="department_id" widget="selection"/>
-=======
 		                <field name="employee_id"/>
 		                <field name="user_id" widget="selection"/>
->>>>>>> MERGE-SOURCE
 	                </group>
 	                <newline/>
 	                <group expand="1" string="Group By..." colspan="10" col="12">
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e508e242827..d40c89fedf6 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -77,6 +77,18 @@
 	                </field>
 	            </group>
                 <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Employee" name="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
+                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-hr"
                     		string="Refused"
@@ -95,19 +107,7 @@
                 	<separator orientation="vertical"/>
                 	<field name="department_id" widget="selection"/>
                 </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Employee" name="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
-                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                </group>
+
             </search>
         </field>
     </record>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 3a7b233504a..880a95b2831 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -20,7 +20,7 @@
                 <field name="product_uom"/>
                 <field name="state"/>
                 <field name="value"/>
-                
+
            </tree>
         </field>
     </record>
@@ -75,7 +75,7 @@
                     	icon="terp-stock"
                     	domain="[('state','=','done')]"
                     	help = "Completed Stock-Moves"/>
-                    	
+
                 <separator orientation="vertical"/>
                 <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage','=','internal')]"/>
                 <filter icon="terp-stock" string="Scrap Locations" domain="[('location_id.scrap_location','=',1)]"/>
@@ -83,15 +83,8 @@
                 <field name="product_id"/>
                 </group>
                 <newline/>
-                
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                <field name="location_id" widget = "selection"/>
-                <field name="location_dest_id"  widget = "selection"/>
-                <field name="date_planned"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." >
-             		<filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter name="product" string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
                     <filter name="src_location" string="Source Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
@@ -102,6 +95,12 @@
                     <filter string="Month" icon="terp-stock" context="{'group_by':'date_planned'}"/>
                     <filter string="Year" icon="terp-stock" context="{'group_by':'year'}"/>
                 </group>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <field name="location_id" widget = "selection"/>
+                <field name="location_dest_id"  widget = "selection"/>
+                <field name="date_planned"/>
+                </group>
+
             </search>
         </field>
     </record>
@@ -118,9 +117,9 @@
 	<menuitem
         id="stock.next_id_61"
         name="Reporting"
-        parent="stock.menu_stock_root" groups="base.group_user"/>    
+        parent="stock.menu_stock_root" groups="base.group_user"/>
 
 	<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
-	
+
 </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 62d1b06fd19..e28e973b23b 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -69,6 +69,19 @@
 						<field name="company_id" groups="base.group_extended" widget="selection"/>
                    </group>
                    <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="5">
+                        <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-stock" domain="[]" context="{'group_by':'year'}"/>
+                    </group>
                 	<group expand="0" string="Extended options..." colspan="10" col="12">
                 		<field name="type"/>
                 		<separator orientation="vertical"/>
@@ -82,20 +95,7 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="date_done"/>
                 	</group>
-                   <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="5">
-                        <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                    	<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                    	<filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
-                    	<separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
-                    	<filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-stock" domain="[]" context="{'group_by':'year'}"/>
-                    </group>
+
                </search>
             </field>
         </record>