diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index edbe704d4db..eb24af577ac 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -74,13 +74,13 @@
                 <page string="Accounting" position="inside">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
-                        <field name="property_account_receivable"/>
+                        <field name="property_account_receivable"  groups="base.group_extended"/>
                         <field name="property_account_position" widget="selection"/>
                         <field name="property_payment_term" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Supplier Accounting Properties" colspan="2"/>
-                        <field name="property_account_payable"/>
+                        <field name="property_account_payable" groups="base.group_extended"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Customer Credit" colspan="2"/>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 2026d90c205..0d05d5f0d76 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -69,7 +69,25 @@
 	                <field name="partner_id"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
+                <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="Associated Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+					<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
+                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <filter string="Account Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <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'}"/>
+                </group>
+
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-account"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
@@ -96,24 +114,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                 </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="Associated Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-					<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
-                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <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'}"/>
-                </group>
-            </search>
+                </search>
         </field>
     </record>
     <record id="view_account_analytic_report_search" model="ir.ui.view">
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 1a811ba4e8e..bfd38fa4ef6 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -94,28 +94,7 @@
                     		domain="[('user_id','=',False)]"/>
                     </field>
 				</group>
-                <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                    <field name="type"/>
-                    <field name="currency_id" widget="selection"/>
-                    <field name="partner_bank" widget="selection"/>
-                    <field name="fiscal_position" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="address_contact_id"/>
-                    <field name="account_id"/>
-                    <newline/>
-                    <field name="payment_term" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <separator orientation="vertical"/>
-                	<field name="address_invoice_id"/>
-                	<field name="product_id"/>
-                	<newline/>
-					<field name="date" string="Date Invoiced"/>
-					<field name="date_due"/>
-                </group>
-                <newline/>
+				<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
@@ -138,6 +117,27 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+                    <field name="type"/>
+                    <field name="currency_id" widget="selection"/>
+                    <field name="partner_bank" widget="selection"/>
+                    <field name="fiscal_position" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="address_contact_id"/>
+                    <field name="account_id"/>
+                    <newline/>
+                    <field name="payment_term" widget="selection"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <separator orientation="vertical"/>
+                	<field name="address_invoice_id"/>
+                	<field name="product_id"/>
+                	<newline/>
+					<field name="date" string="Date Invoiced"/>
+					<field name="date_due"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index ba94bbfb37c..af3f0c26511 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -24,7 +24,7 @@ from tools.translate import _
 class account_chart(osv.osv_memory):
     """
     For Chart of Accounrs
-        """
+    """
     _name = "account.chart"
     _description = "chart"
     _columns = {
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 80166298edb..a4d6904c4ca 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -33,25 +33,25 @@ class audittrail_rule(osv.osv):
     _name = 'audittrail.rule'
     _description = "Audittrail Rule"
     _columns = {
-        "name": fields.char("Rule Name", size=32, required=True), 
-        "object_id": fields.many2one('ir.model', 'Object', required=True), 
-        "user_id": fields.many2many('res.users', 'audittail_rules_users', 
-                                            'user_id', 'rule_id', 'Users'), 
-        "log_read": fields.boolean("Log reads"), 
-        "log_write": fields.boolean("Log writes"), 
-        "log_unlink": fields.boolean("Log deletes"), 
-        "log_create": fields.boolean("Log creates"), 
-        "state": fields.selection((("draft", "Draft"), 
-                                   ("subscribed", "Subscribed")), 
-                                   "State", required=True), 
-        "action_id": fields.many2one('ir.actions.act_window', "Action ID"), 
+        "name": fields.char("Rule Name", size=32, required=True),
+        "object_id": fields.many2one('ir.model', 'Object', required=True),
+        "user_id": fields.many2many('res.users', 'audittail_rules_users',
+                                            'user_id', 'rule_id', 'Users'),
+        "log_read": fields.boolean("Log reads"),
+        "log_write": fields.boolean("Log writes"),
+        "log_unlink": fields.boolean("Log deletes"),
+        "log_create": fields.boolean("Log creates"),
+        "state": fields.selection((("draft", "Draft"),
+                                   ("subscribed", "Subscribed")),
+                                   "State", required=True),
+        "action_id": fields.many2one('ir.actions.act_window', "Action ID"),
     }
 
     _defaults = {
-        'state': lambda *a: 'draft', 
-        'log_create': lambda *a: 1, 
-        'log_unlink': lambda *a: 1, 
-        'log_write': lambda *a: 1, 
+        'state': lambda *a: 'draft',
+        'log_create': lambda *a: 1,
+        'log_unlink': lambda *a: 1,
+        'log_write': lambda *a: 1,
     }
 
     _sql_constraints = [
@@ -65,7 +65,7 @@ class audittrail_rule(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Auddittrail Rule’s IDs.
-        @return: True 
+        @return: True
         """
         obj_action = self.pool.get('ir.actions.act_window')
         obj_model = self.pool.get('ir.model.data')
@@ -74,13 +74,13 @@ class audittrail_rule(osv.osv):
             obj = self.pool.get(thisrule.object_id.model)
             if not obj:
                 raise osv.except_osv(
-                        _('WARNING: audittrail is not part of the pool'), 
+                        _('WARNING: audittrail is not part of the pool'),
                         _('Change audittrail depends -- Setting rule as DRAFT'))
                 self.write(cr, uid, [thisrule.id], {"state": "draft"})
             val = {
-                 "name": 'View Log', 
-                 "res_model": 'audittrail.log', 
-                 "src_model": thisrule.object_id.model, 
+                 "name": 'View Log',
+                 "res_model": 'audittrail.log',
+                 "src_model": thisrule.object_id.model,
                  "domain": "[('object_id','=', " + str(thisrule.object_id.id) + "), ('res_id', '=', active_id)]"
 
             }
@@ -98,7 +98,7 @@ class audittrail_rule(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Auddittrail Rule’s IDs.
-        @return: True 
+        @return: True
         """
         obj_action = self.pool.get('ir.actions.act_window')
         val_obj = self.pool.get('ir.values')
@@ -128,16 +128,16 @@ class audittrail_log(osv.osv):
     _description = "Audittrail Log"
 
     _columns = {
-        "name": fields.char("Name", size=32), 
-        "object_id": fields.many2one('ir.model', 'Object'), 
-        "user_id": fields.many2one('res.users', 'User'), 
-        "method": fields.selection((('read', 'Read'), 
-                                    ('write', 'Write'), 
-                                    ('unlink', 'Delete'), 
-                                    ('create', 'Create')), "Method"), 
-        "timestamp": fields.datetime("Date"), 
-        "res_id": fields.integer('Resource Id'), 
-        "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'), 
+        "name": fields.char("Name", size=32),
+        "object_id": fields.many2one('ir.model', 'Object'),
+        "user_id": fields.many2one('res.users', 'User'),
+        "method": fields.selection((('read', 'Read'),
+                                    ('write', 'Write'),
+                                    ('unlink', 'Delete'),
+                                    ('create', 'Create')), "Method"),
+        "timestamp": fields.datetime("Date"),
+        "res_id": fields.integer('Resource Id'),
+        "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'),
     }
 
     _defaults = {
@@ -155,14 +155,14 @@ class audittrail_log_line(osv.osv):
     _name = 'audittrail.log.line'
     _description = "Log Line"
     _columns = {
-          'field_id': fields.many2one('ir.model.fields', 'Fields', required=True), 
-          'log_id': fields.many2one('audittrail.log', 'Log'), 
-          'log': fields.integer("Log ID"), 
-          'old_value': fields.text("Old Value"), 
-          'new_value': fields.text("New Value"), 
-          'old_value_text': fields.text('Old value Text'), 
-          'new_value_text': fields.text('New value Text'), 
-          'field_description': fields.char('Field Description', size=64), 
+          'field_id': fields.many2one('ir.model.fields', 'Fields', required=True),
+          'log_id': fields.many2one('audittrail.log', 'Log'),
+          'log': fields.integer("Log ID"),
+          'old_value': fields.text("Old Value"),
+          'new_value': fields.text("New Value"),
+          'old_value_text': fields.text('Old value Text'),
+          'new_value_text': fields.text('New value Text'),
+          'field_description': fields.char('Field Description', size=64),
         }
 
 audittrail_log_line()
@@ -170,7 +170,7 @@ audittrail_log_line()
 
 class audittrail_objects_proxy(osv_pool):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
-    
+
     def get_value_text(self, cr, uid, field_name, values, object, context=None):
         """
         Gets textual values for the fields
@@ -178,9 +178,9 @@ class audittrail_objects_proxy(osv_pool):
 
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param field_name: List of fields for text values 
-        @param values: Values for field to be converted into textual values  
-        @return: values: List of textual values for given fields 
+        @param field_name: List of fields for text values
+        @param values: Values for field to be converted into textual values
+        @return: values: List of textual values for given fields
         """
         if not context:
             context = {}
@@ -226,7 +226,7 @@ class audittrail_objects_proxy(osv_pool):
         @param object: Object who's values are being changed
         @param lines: List of values for line is to be created
         """
-        
+
         pool = pooler.get_pool(cr.dbname)
         obj = pool.get(object.model)
         #start Loop
@@ -242,7 +242,7 @@ class audittrail_objects_proxy(osv_pool):
                 new_value = 'new_value' in line and  line['new_value'] or ''
                 old_value_text = 'old_value_text' in line and  line['old_value_text'] or ''
                 new_value_text = 'new_value_text' in line and  line['new_value_text'] or ''
-                
+
                 if old_value_text == new_value_text:
                     continue
                 if fields[0]['ttype'] == 'many2one':
@@ -251,12 +251,12 @@ class audittrail_objects_proxy(osv_pool):
                     if type(new_value) == tuple:
                         new_value = new_value[0]
                 vals = {
-                        "log_id": id, 
-                        "field_id": f_id[0], 
-                        "old_value": old_value, 
-                        "new_value": new_value, 
-                        "old_value_text": old_value_text, 
-                        "new_value_text": new_value_text, 
+                        "log_id": id,
+                        "field_id": f_id[0],
+                        "old_value": old_value,
+                        "new_value": new_value,
+                        "old_value_text": old_value_text,
+                        "new_value_text": new_value_text,
                         "field_description": fields[0]['field_description']
                         }
                 line_id = pool.get('audittrail.log.line').create(cr, uid, vals)
@@ -270,10 +270,10 @@ class audittrail_objects_proxy(osv_pool):
         @param db: the current database
         @param uid: the current user’s ID for security checks,
         @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink 
+        @param method: method to log: create, read, write, unlink
         @param fct_src: execute method of Object proxy
-        
-        @return: Returns result as per method of Object proxy 
+
+        @return: Returns result as per method of Object proxy
         """
         logged_uids = []
         pool = pooler.get_pool(db)
@@ -290,9 +290,9 @@ class audittrail_objects_proxy(osv_pool):
                 resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                 resource_name = resource_name and resource_name[0][1] or ''
                 vals = {
-                        "method": method, 
-                        "object_id": model_object.id, 
-                        "user_id": uid, "res_id": res_id, 
+                        "method": method,
+                        "object_id": model_object.id,
+                        "user_id": uid, "res_id": res_id,
                         "name": resource_name
                         }
                 id = pool.get('audittrail.log').create(cr, uid, vals)
@@ -300,8 +300,8 @@ class audittrail_objects_proxy(osv_pool):
                 for field in new_value:
                     if new_value[field]:
                         line = {
-                              'name': field, 
-                              'new_value': new_value[field], 
+                              'name': field,
+                              'new_value': new_value[field],
                               'new_value_text': self.get_value_text(cr, uid, field, new_value[field], model_object)
                               }
                         lines.append(line)
@@ -329,10 +329,10 @@ class audittrail_objects_proxy(osv_pool):
                         for field in args[1].keys():
                             if args[1].keys():
                                 line = {
-                                      'name': field, 
-                                      'new_value': field in new_values and new_values[field] or '', 
-                                      'old_value': field in old_values and old_values[field] or '', 
-                                      'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object), 
+                                      'name': field,
+                                      'new_value': field in new_values and new_values[field] or '',
+                                      'old_value': field in old_values and old_values[field] or '',
+                                      'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object),
                                       'old_value_text': old_values_text[field]
                                       }
                                 lines.append(line)
@@ -360,8 +360,8 @@ class audittrail_objects_proxy(osv_pool):
                     for field in old_values[res_id]:
                         if old_values[res_id][field]:
                             line = {
-                                      'name': field, 
-                                      'old_value': old_values[res_id][field], 
+                                      'name': field,
+                                      'old_value': old_values[res_id][field],
                                       'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
                                       }
                             lines.append(line)
@@ -385,8 +385,8 @@ class audittrail_objects_proxy(osv_pool):
                     for field in old_values[res_id]:
                         if old_values[res_id][field]:
                             line = {
-                                  'name': field, 
-                                  'old_value': old_values[res_id][field], 
+                                  'name': field,
+                                  'old_value': old_values[res_id][field],
                                   'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
                                   }
                             lines.append(line)
@@ -403,9 +403,9 @@ class audittrail_objects_proxy(osv_pool):
         @param db: the current database
         @param uid: the current user’s ID for security checks,
         @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink 
-        
-        @return: Returns result as per method of Object proxy 
+        @param method: method to log: create, read, write, unlink
+
+        @return: Returns result as per method of Object proxy
         """
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
@@ -433,7 +433,7 @@ class audittrail_objects_proxy(osv_pool):
                     logged_uids.append(user.id)
                 if not logged_uids or uid in logged_uids:
                     if field in ('read', 'write', 'create', 'unlink'):
-                        if getattr(thisrule, 'log_' + field):
+                        if getattr(thisrule, 'log_',''):
                             return self.log_fct(db, uid, object, method, fct_src, *args)
                 return fct_src(db, uid, object, method, *args)
         res = my_fct(db, uid, object, method, *args)
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d31266c9090..1e207c1134a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -124,8 +124,6 @@
                </search>
             </field>
         </record>
-        
-        <!--		Action for attendee view-->
 
 		<record id="action_view_attendee_form" model="ir.actions.act_window">
 	         <field name="name">Event Invitations</field>
@@ -136,12 +134,12 @@
 	         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
 	         <field name="context">{'default_sent_by_uid': uid}</field>
 	     </record>
-		
+
 		<!-- Calenadar's menu -->
 		
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="10" />
-		
+
 		<!-- Invitation menu -->
 		
 		<menuitem id="menu_attendee_invitations"
@@ -183,8 +181,6 @@
                 </tree>
             </field>
         </record>
-            
-		<!--		Action for alarms view-->
 
         <record id="action_res_alarm_view" model="ir.actions.act_window">
             <field name="name">Available Alarms</field>
@@ -201,8 +197,8 @@
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
 
-        <!-- Event Form View-->	
-	
+        <!-- Event Form View-->
+
 		<record model="ir.ui.view" id="event_form_view">
 	        <field name="name">Event Form</field>
 	        <field name="model">calendar.event</field>
@@ -363,7 +359,7 @@
 	            </tree>
 	        </field>
 	    </record>
-	    
+
 		<!-- Event Calendar View  -->
 
 		<record model="ir.ui.view" id="event_calendar_view">
@@ -379,9 +375,9 @@
 	            </calendar>
 	        </field>
 	    </record>
-	    
+
 		<!--	 Event Search View-->
-	    
+
 	    <record id="view_calendar_event_filter" model="ir.ui.view">
 	        <field name="name">Calendar Events Search</field>
 	        <field name="model">calendar.event</field>
@@ -402,7 +398,7 @@
                            <field name="class" select="1"/>
                        </group>
                        <newline/>
-						<group expand="0" string="Group By..." colspan="16">
+						<group expand="1" string="Group By..." colspan="16">
 							<filter string="Date" icon="terp-project"
 						        domain="[]" context="{'group_by':'date'}" />
 						    <filter string="Availability" icon="terp-project"
@@ -419,7 +415,7 @@
 
 
 	    <!-- Event action  -->
-	    
+
 		<record id="action_view_event" model="ir.actions.act_window">
 	            <field name="name">Events</field>
 	            <field name="type">ir.actions.act_window</field>
@@ -428,12 +424,12 @@
 	            <field name="view_mode">tree,form,calendar</field>
 	            <field name="search_view_id" ref="view_calendar_event_filter"/>
 	        </record>
-		
+
 		<!-- Event menu  -->
 
 		<menuitem id="menu_events"
 				name="Events" parent="base.menu_calendar_configuration"
 				sequence="5" action="action_view_event" />
-		
+
      </data>
  </openerp>
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index ebf2ce92092..eba4e092f14 100755
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -6,3 +6,4 @@
 "access_calendar_todo","calendar.todo","model_calendar_todo",,1,1,1,1
 "access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",,1,1,1,1
 "access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",,1,1,1,1
+"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",,1,1,1,1
diff --git a/addons/base_report_creator/wizard/base_report_creator_open.py b/addons/base_report_creator/wizard/base_report_creator_open.py
index be7420c5744..f85b38b626a 100644
--- a/addons/base_report_creator/wizard/base_report_creator_open.py
+++ b/addons/base_report_creator/wizard/base_report_creator_open.py
@@ -27,8 +27,6 @@ import pooler
 from osv import osv
 from tools.translate import _
 
-
-
 class report_creator_open(wizard.interface):
     def _open_report(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index ac61809cfad..bab9be8733e 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -277,7 +277,7 @@
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                        <newline/>
-					   	<group expand="0" string="Group By..." colspan="16">
+					   	<group expand="1" string="Group By..." colspan="16">
 							<filter string="Date" icon="terp-project"
 						        domain="[]" context="{'group_by':'date'}" />
 						    <filter string="Privacy" icon="terp-crm"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3ce0ce788f6..38af54200ef 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -307,7 +307,7 @@
                         help="My Sale Team" />
                 </field>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="16">
+                <group expand="1" string="Group By..." colspan="16">
                     <filter string="Stage" icon="terp-crm" domain="[]"
                         context="{'group_by':'stage_id'}" />
                     <filter string="Priority" icon="terp-crm" domain="[]"
@@ -327,7 +327,7 @@
            </search>
         </field>
     </record>
-    
+
     <!--  Partners inherited form -->
 
 		<record id="view_opp_partner_info_form" model="ir.ui.view">
@@ -344,11 +344,11 @@
 				                <field name="name"/>
 				                <field name="email_from"/>
 				                <field name="phone"/>
-				
+
 				                <field name="categ_id" invisible="1"/>
 				                <field name="type_id" invisible="1"/>
 				                <field name="referred" invisible="1"/>
-				
+
 				                <field name="stage_id"/>
 				                <button name="stage_previous" string="Previous"
 				                    states="open,pending" type="object" icon="gtk-go-back" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a72a8df9de8..20f61073cb8 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -137,7 +137,7 @@
             </form>
         </field>
     </record>
-	
+
 	<!--Inbound Phonecalls Form View -->
 
 	<record model="ir.ui.view" id="crm_case_inbound_phone_form_view">
@@ -197,9 +197,9 @@
             </form>
         </field>
     </record>
-    
+
     <!--Inbound Phonecalls Tree View -->
-    
+
     <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
         <field name="name">CRM - Inbound Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
@@ -274,7 +274,7 @@
                        help="My Sale Team" />
                </field>
                <newline/>
-               <group expand="0" string="Group By..." colspan="4">
+               <group expand="1" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"
                        context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-crm"
@@ -288,9 +288,9 @@
            </search>
         </field>
     </record>
-    
+
         <!--  Partners inherited form -->
-        
+
     <record id="view_phonecall_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.phonecall.info.inherit</field>
             <field name="model">res.partner</field>
@@ -302,6 +302,6 @@
                		</field>
             </field>
         </record>
-    
+
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 70230e4c072..c5185c81f23 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -119,20 +119,6 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                   		<group>
-		            	    <separator orientation="vertical"/>
-		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-			            </group>
-                   </group>
-                   <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" name="User" icon="terp-sale"
                         	domain="[]" context="{'group_by':'user_id'}" />
@@ -166,6 +152,21 @@
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+                   		<group>
+		            	    <separator orientation="vertical"/>
+		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+			            </group>
+                   </group>
                </search>
             </field>
         </record>
@@ -254,4 +255,4 @@
            parent="base.next_id_64" action="action_report_crm_opportunity" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a4f76acb53a..c30bc0375e1 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -118,8 +118,39 @@
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
+                    <newline/>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                            domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                            domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                            domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                            domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                            domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                            domain="[]" context="{'group_by':'name'}" />
+                  </group>
+
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -131,39 +162,8 @@
 		            	    <separator orientation="vertical"/>
 			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
 			             </group>
-
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
                </search>
             </field>
         </record>
@@ -200,4 +200,4 @@
             id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7a3dd4cc829..a813bd5dc60 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -271,7 +271,7 @@
                    <field name="section_id" select="1"
                        widget="selection"/>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="10" col="20">
+                   <group expand="1" string="Group By..." colspan="10" col="20">
                        <filter string="Deadline" icon="terp-crm"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 3ac93bdc6a4..5501aa8440d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -122,8 +122,47 @@
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
+                    <newline/>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                            domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+
+                        <filter string="Section" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                            domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Stage" icon="terp-sale" domain="[]"
+                             context="{'group_by':'stage_id'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                            domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical"/>
+                         <filter string="Priority" icon="terp-sale" domain="[]"
+                             context="{'group_by':'priority'}" />
+                         <filter string="Type" icon="terp-sale" domain="[]"
+                             context="{'group_by':'type_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                            domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                            domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                            domain="[]" context="{'group_by':'name'}" />
+                  </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -141,46 +180,6 @@
 			                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
 		                </group>
                    </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-						<filter string="Stage" icon="terp-sale" domain="[]"
-		                     context="{'group_by':'stage_id'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-
-						<separator orientation="vertical"/>
-		                 <filter string="Priority" icon="terp-sale" domain="[]"
-		                     context="{'group_by':'priority'}" />
-		                 <filter string="Type" icon="terp-sale" domain="[]"
-		                     context="{'group_by':'type_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
                </search>
             </field>
         </record>
@@ -218,4 +217,4 @@
 
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 68fcd768d74..f5adb66960a 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -284,7 +284,7 @@
                             </field>
                         </group>
                         <newline/>
-                        <group expand="0" string="Group By..." colspan="10" col="20">
+                        <group expand="1" string="Group By..." colspan="10" col="20">
                             <filter string="Partner" icon="terp-partner"
                                 domain="[]"
                                 context="{'group_by':'partner_id'}" />
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 7b1375833d8..2fc32a3e15b 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -121,8 +121,38 @@
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                            domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                            domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                            domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                            domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                            domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                            domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="0" string="Extended options..." colspan="10" col="12">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -135,39 +165,7 @@
 		            	    <separator orientation="vertical"/>
 			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
 			             </group>
-
                    </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 27ccee6ef0d..30ecce93703 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -243,7 +243,7 @@
                             help="My section" />
                     </field>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="12" col="20">
+                    <group expand="1" string="Group By..." colspan="12" col="20">
                         <filter string="Customer" icon="terp-crm"
                             domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="State" icon="terp-crm" domain="[]"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index bcdf42c9ee1..b673f9ace22 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,36 +114,10 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Extended filters..." colspan="4" col="5">
-                        <filter icon="terp-sale"
-                            string="Lowest"
-                            domain="[('priority','=','5')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Low"
-                            domain="[('priority','=','4')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Normal"
-                            domain="[('priority','=','3')]"/>
-
-                        <filter icon="terp-sale"
-                            string="High"
-                            domain="[('priority','=','2')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Highest"
-                            domain="[('priority','=','1')]"/>
-
-                   </group>
-                   <newline/>
-
-<!-- Helpdesk report after Sales Services Apply Group -->
-
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}"
-                        	default="1" />
+                            domain="[]" context="{'group_by':'user_id'}"
+                            default="1" />
 
                         <filter string="Company" icon="terp-sale"
                             domain="[]"
@@ -169,6 +143,31 @@
                             domain="[]" context="{'group_by':'name'}" />
 
                   </group>
+                    <newline/>
+                   <group expand="0" string="Extended options..." colspan="4" col="5" groups="base.group_extended">
+                        <filter icon="terp-sale"
+                            string="Lowest"
+                            domain="[('priority','=','5')]"/>
+
+                        <filter icon="terp-sale"
+                            string="Low"
+                            domain="[('priority','=','4')]"/>
+
+                        <filter icon="terp-sale"
+                            string="Normal"
+                            domain="[('priority','=','3')]"/>
+
+                        <filter icon="terp-sale"
+                            string="High"
+                            domain="[('priority','=','2')]"/>
+
+                        <filter icon="terp-sale"
+                            string="Highest"
+                            domain="[('priority','=','1')]"/>
+
+                   </group>
+                   
+
                </search>
             </field>
         </record>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 720ab6de69f..69c000e89a6 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -118,7 +118,7 @@
     <record model="ir.ui.view" id="view_document_directory_tree">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
-        <field name="type">tree</field>        
+        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Directories" toolbar="1">
                 <field name="name"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 7f00a6c935b..4bcb711d24e 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -71,7 +71,19 @@
 	                <field name="employee_id" widget="selection"/>
                 </group>
                 <newline/>
-				<group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
+                <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="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Plan" icon="terp-hr" context="{'group_by':'plan_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':'create_date'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
+                 <newline/>
+				<group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                 	<filter icon="terp-hr"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -87,18 +99,6 @@
                     <field name="create_date"/>
                     <field name="closed"/>
                 </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="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Plan" icon="terp-hr" context="{'group_by':'plan_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':'create_date'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 194ea629d10..4884b1c30c8 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -87,6 +87,24 @@
                     <field name="employee_id" widget="selection"/>
 				</group>
 				<newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/>
+                    <filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/>
+                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
+				<newline/>
 				<group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
 					<filter string="Invoiced"
 	                   		icon="terp-hr"
@@ -109,24 +127,6 @@
                     <field name="date_confirm"/>
                     <field name="date_valid"/>
                 </group>
-                <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/>
-                    <filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/>
-                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-                    <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a3bf7a08ab9..d4d197a73fe 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -232,7 +232,7 @@
                        help="My Department"/>
                </field>
                <newline/>
-                <group expand="0" string="Group By..." colspan="11" col="20">
+                <group expand="1" string="Group By..." colspan="11" col="20">
                     <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Responsible" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 2315e707911..d9d5cb04634 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -92,8 +92,26 @@
                         domain="[('user_id','=',False)]"/>
                 </field>
                 </group>
+                 <newline/>
+                <group expand="1" string="Group By ..." colspan="10" col="12">
+                   <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
+                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
+                   <separator orientation="vertical"/>
+                   <filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
+                   <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
+            	   <separator orientation="vertical"/>
+            	   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
+            	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
+            	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
+            	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
+                </group>
+
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-hr"
                     		string="Hired"
                         name="done"
@@ -114,25 +132,8 @@
                   	<field name="type_id" widget="selection"/>
                   	<field name="partner_id"/>
                   	<field name="partner_address_id"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Group By ..." colspan="10" col="12">
-                   <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
-                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
-                   <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
-            	   <separator orientation="vertical"/>
-            	   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
-            	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
-            	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
-            	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
-                </group>
-            </search>
+                </group>             
+                </search>
         </field>
     </record>
 
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 67c885a576d..65ec6aa1b1b 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -69,24 +69,24 @@
 	                    <field name="account_id"/>
                         <field name="product_id"/>
                     </group>
+                    <group expand="1" string="Group By..." colspan="10" col="12">
+                        <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+                        <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
+                    </group>
                     <newline/>
 	                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
 	                    <field name="date"/>
 	                    <separator orientation="vertical"/>
 	                    <field name="invoice_id" widget="selection"/>
                     </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-	                    <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-	                    <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
-                    </group>
+
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 8469ce8999b..0ea40619b3d 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -74,9 +74,25 @@
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
 	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>                              
+                    <group expand="1" string="Group By..." colspan="10" col="12">
+	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
+	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
+	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+	                    <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':'month'}"/>
+	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+                    <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
 	                	<filter icon="terp-hr"
 	                    		string="New"
 	                    		domain="[('state','=','new')]"/>
@@ -94,24 +110,7 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="general_account_id"/>
 	                    <field name="to_invoice" widget="selection"/>
-	                </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
-	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-	                    <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':'month'}"/>
-	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                    </group>
+	                </group>                    
                 </search>
             </field>
         </record>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 0164fced99a..6610abad28c 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -57,7 +57,22 @@
 						<field name="date_planned"/>
                    </group>
                    <newline/>
-	                <group expand="1" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
+
+                   <group expand="1" string="Group By..." colspan="4" col="6">
+                    	<filter string="Source Location" icon="terp-mrp" context="{'group_by':'location_src_id'}"/>
+                    	<filter string="Destination Location" icon="terp-mrp" context="{'group_by':'location_dest_id'}"/>
+                    	<filter string="Picking" icon="terp-mrp" context="{'group_by':'picking_id'}"/>
+                    	<separator orientation="vertical"/>
+                        <filter string="Routing" icon="terp-mrp" context="{'group_by':'routing_id'}"/>
+                        <filter string="Product" name="Product" icon="terp-mrp" context="{'group_by':'product_id'}" />
+                        <filter string="State" icon="terp-mrp" context="{'group_by':'state'}"/>
+                    	<separator orientation="vertical"/>
+                    	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
+                    	<filter string="Month" icon="terp-mrp" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
+                   </group>
+                    <newline/>
+	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
 	                    <filter icon="terp-mrp" string="Draft" domain="[('state','=','draft')]"/>
 	                    <filter icon="terp-mrp" string="Picking Exception" domain="[('state','=','picking_except')]"/>
 	                    <separator orientation="vertical"/>
@@ -76,22 +91,8 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="date_start"/>
 						<field name="date_finnished"/>
-	                </group>
-                   <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="6">
-                    	<filter string="Source Location" icon="terp-mrp" context="{'group_by':'location_src_id'}"/>
-                    	<filter string="Destination Location" icon="terp-mrp" context="{'group_by':'location_dest_id'}"/>
-                    	<filter string="Picking" icon="terp-mrp" context="{'group_by':'picking_id'}"/>
-                    	<separator orientation="vertical"/>
-                        <filter string="Routing" icon="terp-mrp" context="{'group_by':'routing_id'}"/>
-                        <filter string="Product" name="Product" icon="terp-mrp" context="{'group_by':'product_id'}" />
-                        <filter string="State" icon="terp-mrp" context="{'group_by':'state'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
-                    	<filter string="Month" icon="terp-mrp" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
-                   </group>
-               </search>
+	                </group>                   
+                  </search>
             </field>
         </record>
         <record id="action_report_mrp_production_order" model="ir.actions.act_window">
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index beb3453d224..5f677e7a8c6 100644
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -10,13 +10,14 @@
             multi="True"
             id="bi_conf_cube_query_builder"/>
 
-    <wizard
+
+   <!--   <wizard
             string="Load Tables"
             model="olap.schema"
             name="olap.load.table"
             menu= "False"
             multi="True"
-            id="bi_menu_olap_load_table"/>
+            id="bi_menu_olap_load_table"/>-->
 
 
         <wizard
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 354bfd053aa..6cb39b1bc02 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -17,18 +17,18 @@
                    <field name="default_code"/>
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
-                   <group col='8' colspan='14' expand="1" string="Extended options..." groups="base.group_extended">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
-                   </group>
-                   <newline/>
-                   <group col='8' colspan='15' expand='1' string='Group by...' groups="base.group_extended">
+                   <newline/>                   
+                   <group col='8' colspan='15' expand='1' string='Group by...'>
                        <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
+                   <newline/>                   
+                   <group col='8' colspan='14' expand="0" string="Extended options..." 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 4a5a2dadb06..6b60285e481 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -104,21 +104,6 @@
 	                    </field>
 	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-	                    <field name="type" widget="selection"/>
-	                    <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <separator orientation="vertical"/>
-	                    <field name="date_deadline"/>
-	                    <newline/>
-	                    <field name="priority"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="date_end"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="partner_id" />
-                    </group>
-                    <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="11">
                         <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
                         <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
@@ -133,6 +118,20 @@
                         <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
                     </group>
+                    <newline/>
+	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+	                    <field name="type" widget="selection"/>
+	                    <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <separator orientation="vertical"/>
+	                    <field name="date_deadline"/>
+	                    <newline/>
+	                    <field name="priority"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="date_end"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="partner_id" />
+                    </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 e3692e0409b..5694d33993b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -96,38 +96,6 @@
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                    	<group>
-                    		<separator orientation="vertical"/>
-                  			<field name="project_id" widget="selection" />
-                    		<field name="priority" />
-                    		<separator orientation="vertical"/>
-                    		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="task_id"/>
-                    		<separator orientation="vertical"/>
-                    		<field name="assigned_to" widget="selection">
-                    			<filter icon="terp-crm"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
- 						    	<filter icon="terp-crm"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
-                    		</field>
-                    		<newline/>
-                    		<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="partner_id"  />
-                    		<field name="canal_id" widget="selection"/>
-                            <separator orientation="vertical"/>
-                            <field name="date_closed" string="Date Closed"/>
-                        </group>
-
-                   </group>
-                   <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" name="User" icon="terp-sale"
                         	domain="[]" context="{'group_by':'user_id'}" />
@@ -170,6 +138,38 @@
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+                    	<group>
+                    		<separator orientation="vertical"/>
+                  			<field name="project_id" widget="selection" />
+                    		<field name="priority" />
+                    		<separator orientation="vertical"/>
+                    		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                    		<field name="task_id"/>
+                    		<separator orientation="vertical"/>
+                    		<field name="assigned_to" widget="selection">
+                    			<filter icon="terp-crm"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
+ 						    	<filter icon="terp-crm"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
+                    		</field>
+                    		<newline/>
+                    		<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="partner_id"  />
+                    		<field name="canal_id" widget="selection"/>
+                            <separator orientation="vertical"/>
+                            <field name="date_closed" string="Date Closed"/>
+                        </group>
+
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 494fc49d04b..0cfc357b51f 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -88,6 +88,28 @@
                 <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="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
+                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
+                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
+                    <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
+                    <newline/>
+                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
+                </group>
+				<newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
@@ -113,28 +135,6 @@
  					<newline/>
 					<field name="date"/>
                 </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
-                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
-                    <newline/>
-                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index ed1f17a0833..756fde9663d 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -87,6 +87,29 @@
 	                <field name="product_id"/>
 				</group>
 				<newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
+                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Fiscal Position" icon="terp-sale" context="{'group_by':'fiscal_position'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
+                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
+                    <filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
+                    <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
+                    <newline/>
+                    <filter string="Invoice Address Name" icon="terp-sale" context="{'group_by':'partner_invoice_id'}"/>
+                    <filter string="Ordering Contact Name" icon="terp-sale" context="{'group_by':'partner_order_id'}"/>
+                    <filter string="Shipping Address Name" icon="terp-sale" context="{'group_by':'partner_shipping_id'}"/>
+                    <separator orientation="vertical"/>
+					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                </group>
+				<newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-sale" string="       Invoice Exception      " domain="[('state','=','invoice_except')]"/>
@@ -110,30 +133,6 @@
                     <field name="date"/>
                     <field name="date_confirm"/>
                 </group>
-                <newline/>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                    <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Fiscal Position" icon="terp-sale" context="{'group_by':'fiscal_position'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
-                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
-                    <filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
-                    <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
-                    <newline/>
-                    <filter string="Invoice Address Name" icon="terp-sale" context="{'group_by':'partner_invoice_id'}"/>
-                    <filter string="Ordering Contact Name" icon="terp-sale" context="{'group_by':'partner_order_id'}"/>
-                    <filter string="Shipping Address Name" icon="terp-sale" context="{'group_by':'partner_shipping_id'}"/>
-                    <separator orientation="vertical"/>
-					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 487dbcf55ea..be2ed4bfc55 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -14,8 +14,8 @@
         <page string="Sales &amp; Purchases" position="inside">
           <group colspan="4" col="4" groups="base.group_extended">
             <separator string="Stock Properties" colspan="4"/>
-            <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" />
-            <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]"/>
+            <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" groups="base.group_extended" />
+            <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
           </group>
         </page>
       </field>