From af43c90794dc7c07bbd32f43672ed1c1894c36a5 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 19 May 2010 19:25:19 +0530
Subject: [PATCH 1/6] Task-ID 771:store log details for workflow

bzr revid: ksa@tinyerp.co.in-20100519135519-omr1rb42u0oijh1k
---
 addons/audittrail/audittrail.py       | 210 +++++++++++++++++---------
 addons/audittrail/audittrail_view.xml |  42 +++---
 2 files changed, 162 insertions(+), 90 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 16041889575..f05c902147d 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -25,6 +25,7 @@ from tools.translate import _
 import ir
 import pooler
 import time
+import tools
 
 class audittrail_rule(osv.osv):
     """
@@ -33,25 +34,27 @@ 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', help="if  User is not added then it will applicable for all 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', help="if  User is not added then it will applicable for all 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"),
+        "log_action": fields.boolean("Log Action"),
+        "log_workflow": fields.boolean("Log Workflow"),
+        "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 +68,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 +77,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 +101,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 +131,18 @@ 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'),
+                                    ('action','Action'),
+                                    ('workflow','Workflow')), "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 +160,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 +175,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 +183,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 +231,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 +247,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 +256,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)
@@ -264,22 +269,24 @@ class audittrail_objects_proxy(osv_pool):
                 #End Loop
         return True
 
+
     def log_fct(self, db, uid, object, method, fct_src, *args):
         """
         Logging function: This function is performs logging oprations according to method
         @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)
         cr = pooler.get_db(db).cursor()
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
         model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+
         if method in ('create'):
             res_id = fct_src(db, uid, object, method, *args)
             cr.commit()
@@ -290,9 +297,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 +307,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 +336,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 +367,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 +392,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 +410,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()
@@ -440,7 +447,68 @@ class audittrail_objects_proxy(osv_pool):
         cr.close()
         return res
 
+
+    def workflow_log(self, db, uid, object, method, *args, **argv):
+        """
+        Logging function: This function is performs logging oprations according to method
+        @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 fct_src: execute method of Object proxy
+
+        @return: Returns result as per method of Object proxy
+        """
+        logged_uids = []
+        pool = pooler.get_pool(db)
+        cr = pooler.get_db(db).cursor()
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+        workflow_obj = pool.get('workflow')
+        wkf_ids = workflow_obj.search(cr, uid, [('osv', '=', object)])
+        wkf_name= workflow_obj.browse(cr, uid, wkf_ids)[0].name
+
+        res = super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+        resource_name = pool.get(model_object.model).name_get(cr, uid, [args[0]])
+        resource_name = resource_name and resource_name[0][1] or ''
+        l_id = pool.get('audittrail.log').create(cr, uid, {"method": 'workflow', "object_id": model_object.id, "user_id": uid, "res_id": args[0], "name": resource_name +"/"+ wkf_name })
+        cr.commit()
+        cr.close()
+        return res
+
+
+    def exec_workflow(self, db, uid, object, method, *args, **argv):
+        pool = pooler.get_pool(db)
+        cr = pooler.get_db(db).cursor()
+        cr.autocommit(True)
+        logged_uids = []
+        fct_src = super(audittrail_objects_proxy, self).execute
+        field = method
+        rule = False
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+        for obj_name in pool.obj_list():
+            if obj_name == 'audittrail.rule':
+                rule = True
+        if not rule:
+            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+        if not obj_ids:
+            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+        rule_ids = pool.get('audittrail.rule').search(cr, uid, [('object_id', '=', obj_ids[0]), ('state', '=', 'subscribed')])
+        if not rule_ids:
+             res = super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+
+        for thisrule in pool.get('audittrail.rule').browse(cr, uid, rule_ids):
+            for user in thisrule.user_id:
+                logged_uids.append(user.id)
+            if not logged_uids or uid in logged_uids:
+                 if thisrule.log_workflow:
+                     return self.workflow_log(db, uid, object, method, *args,**argv)
+            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+
+        cr.close()
+
 audittrail_objects_proxy()
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index c8999e78774..ae8f3fee95a 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -12,10 +12,12 @@
                 <form string="AuditTrail Rule">
                     <field name="name" select="1" required="1"/>
                     <field name="object_id" select="1"/>
-                    <field name="log_read" />
-                    <field name="log_write" />
-                    <field name="log_unlink" />
-                    <field name="log_create" />
+                    <field name="log_read"/>
+                    <field name="log_write"/>
+                    <field name="log_unlink"/>
+                    <field name="log_create"/>
+                    <field name="log_action"/>
+                    <field name="log_workflow"/>
                     <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
                     <field name="user_id" select="1" colspan="4" nolabel="1" />
                     <field name="action_id" colspan="4" readonly="1" groups="base.group_extended"/>
@@ -43,13 +45,15 @@
                     <field name="log_write" />
                     <field name="log_unlink" />
                     <field name="log_create" />
+                     <field name="log_action"/>
+                    <field name="log_workflow"/>
                     <field name="state" />
                     <button string="Subscribe" name="subscribe"
                             type="object" states="draft" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
-        
+
         <!-- Audittrail rule  Search View -->
 
 	    <record id="view_audittrail_rule_filter" model="ir.ui.view">
@@ -70,17 +74,17 @@
 		                <field name="name"/>
 		                <field name="object_id" widget="selection"/>
 		                <field name="user_id" widget="selection"/>
-		            </group>    
+		            </group>
 	                <newline/>
 	                <group expand="1" string="Group By..." colspan="14">
 	                    <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
 	                    <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
 	                </group>
- 					<newline/>	                
+ 					<newline/>
 	            </search>
 	        </field>
 	    </record>
-	    
+
     <!-- Action for audittrail rule -->
 
         <record model="ir.actions.act_window" id="action_audittrail_rule_tree">
@@ -117,19 +121,19 @@
             <field name="arch" type="xml">
                 <form string="AuditTrail Logs">
                     <field name="timestamp" select="1" required="1" readonly="1"/>
-                    <field name="object_id" select="1" readonly="1"/>
-                    <field name="method" select="1" readonly="1"/>
                     <field name="user_id" select="1" readonly="1"/>
-                    <field name="res_id" readonly="1"/>
+                    <field name="method" select="1" readonly="1"/>
                     <field name="name" readonly="1" select="1"/>
+                    <field name="res_id" readonly="1"/>
+                    <field name="object_id" select="1" readonly="1"/>
                     <field name="line_ids" colspan="4" mode="tree,form"
                         widget="one2many_list" readonly="1" nolabel="1">
                         <form string="Log Lines">
-                            <group colspan="4" col="2">       
-                            <field name="field_id" 
+                            <group colspan="4" col="2">
+                            <field name="field_id"
                                 readonly="1" colspan="4"/>
                             <newline />
-                            <field name="field_description" 
+                            <field name="field_description"
                                 readonly="1" colspan="4"/>
                             <newline />
                             </group>
@@ -178,7 +182,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_audittrail_log_filter" model="ir.ui.view">
 	        <field name="name">Audittrail-log Search</field>
 	        <field name="model">audittrail.log</field>
@@ -191,15 +195,15 @@
                     <field name="object_id" widget="selection"/>
                     <field name="method" />
                     <field name="user_id" widget="selection"/>
-		            </group>    
+		            </group>
 	                <newline/>
 	                 <group expand="1" string="Group By..." colspan="14">
 	              		<filter string="Log Date" icon="terp-crm" domain="[]" context="{'group_by':'timestamp'}"/>
-	              		<filter string="Log Method" icon="terp-crm" domain="[]" context="{'group_by':'method'}"/>	   
+	              		<filter string="Log Method" icon="terp-crm" domain="[]" context="{'group_by':'method'}"/>
 	                    <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
 	                    <filter string="User" icon="terp-partner" name="user" domain="[]" context="{'group_by':'user_id'}"/>
 	                </group>
- 					<newline/>	                
+ 					<newline/>
 	            </search>
 	        </field>
 	    </record>
@@ -213,7 +217,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_audittrail_log_filter"/>
         </record>
-        
+
         <menuitem name="Logs" id="menu_action_audittrail_log_tree"
             action="action_audittrail_log_tree" parent="menu_action_audittrail" />
 

From 5fd7901bf31d37e2a806bf7c4fea846c6aafa84c Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 20 May 2010 12:37:18 +0530
Subject: [PATCH 2/6] [ADD]: audittrail:[task-771] store log details for
 workflow

bzr revid: ksa@tinyerp.co.in-20100520070718-wwv21ttafwb0su1m
---
 addons/audittrail/audittrail.py | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index f05c902147d..39930dceca8 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -231,7 +231,6 @@ 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
@@ -282,6 +281,7 @@ class audittrail_objects_proxy(osv_pool):
         @return: Returns result as per method of Object proxy
         """
         logged_uids = []
+        res2 = args
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
@@ -448,7 +448,7 @@ class audittrail_objects_proxy(osv_pool):
         return res
 
 
-    def workflow_log(self, db, uid, object, method, *args, **argv):
+    def workflow_log(self, db, uid, object, method,*args, **argv):
         """
         Logging function: This function is performs logging oprations according to method
         @param db: the current database
@@ -464,14 +464,40 @@ class audittrail_objects_proxy(osv_pool):
         cr = pooler.get_db(db).cursor()
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
         model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+
         workflow_obj = pool.get('workflow')
         wkf_ids = workflow_obj.search(cr, uid, [('osv', '=', object)])
         wkf_name= workflow_obj.browse(cr, uid, wkf_ids)[0].name
 
+        res_id = args[0]
+        old_values_text = {}
+        old_values = pool.get(model_object.model).read(cr, uid, res_id)
+        for field in old_values.keys():
+            old_values_text[field] = self.get_value_text(cr, uid, field, old_values[field], model_object)
+
         res = super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+        cr.commit()
+        new_values = pool.get(model_object.model).read(cr, uid, res_id)
+
         resource_name = pool.get(model_object.model).name_get(cr, uid, [args[0]])
         resource_name = resource_name and resource_name[0][1] or ''
         l_id = pool.get('audittrail.log').create(cr, uid, {"method": 'workflow', "object_id": model_object.id, "user_id": uid, "res_id": args[0], "name": resource_name +"/"+ wkf_name })
+        lines = []
+        diff = {}
+        log_line_pool = pool.get('audittrail.log.line')
+
+        for field in old_values.keys():
+            if old_values[field] == new_values[field]:
+                continue
+            else:
+                diff.update({field: (old_values[field], new_values[field])})
+                f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', field), ('model_id', '=', model_object.id)])
+                log_line_pool.create(cr, uid, {'field_id': f_id[0], 'log_id': l_id, \
+                                'old_value': str(old_values[field]),\
+                                 'new_value': str(new_values[field]),\
+                                 'old_value_text':str(old_values_text[field]),
+                                 'new_value_text':self.get_value_text(cr, uid, field, new_values[field], model_object),
+                                 })
         cr.commit()
         cr.close()
         return res

From 7104b7ee9d2e785666a54b20730cafe2b263a0fe Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 24 May 2010 10:32:31 +0530
Subject: [PATCH 3/6] [ADD] : wiki_sale_faq: Add new Module

bzr revid: ksa@tinyerp.co.in-20100524050231-gjxr5qnp3eio2177
---
 addons/wiki_sale_faq/__init__.py       |  22 ++++++
 addons/wiki_sale_faq/__openerp__.py    |  37 +++++++++
 addons/wiki_sale_faq/wiki_sale_faq.xml | 100 +++++++++++++++++++++++++
 3 files changed, 159 insertions(+)
 create mode 100644 addons/wiki_sale_faq/__init__.py
 create mode 100644 addons/wiki_sale_faq/__openerp__.py
 create mode 100644 addons/wiki_sale_faq/wiki_sale_faq.xml

diff --git a/addons/wiki_sale_faq/__init__.py b/addons/wiki_sale_faq/__init__.py
new file mode 100644
index 00000000000..938f045b9fd
--- /dev/null
+++ b/addons/wiki_sale_faq/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
new file mode 100644
index 00000000000..477a1282bd4
--- /dev/null
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Document Management - Wiki -Sale - FAQ',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """This module provides a wiki FAQ Template
+    """,
+    'author': 'Tiny',
+    'website': 'http://openerp.com',
+    'depends': ['wiki','document','crm'],
+    'init_xml': [],
+    'update_xml': ['wiki_sale_faq.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_sale_faq/wiki_sale_faq.xml b/addons/wiki_sale_faq/wiki_sale_faq.xml
new file mode 100644
index 00000000000..c3ae55a0f0e
--- /dev/null
+++ b/addons/wiki_sale_faq/wiki_sale_faq.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <menuitem name="Sales Management" icon="terp-stock"
+           id="base.menu_document" sequence="4" />
+
+         <record id="wiki_groups_faq" model="wiki.groups">
+            <field name="name">Internal FAQ</field>
+            <field name="method">list</field>
+            <field eval="2" name="section"/>
+            <field name="template">== Question ==
+
+== Answer ==
+
+== External Links ==
+
+            </field>
+        </record>
+        <record id="wiki_wiki_dms" model="wiki.wiki">
+            <field name="name">Document Management System ?</field>
+            <field name="tags">dms, document</field>
+            <field name="group_id" ref="wiki_groups_faq"/>
+            <field name="minor_edit">0</field>
+            <field name="toc">1</field>
+            <field name="section">1</field>
+            <field name="summary">Initial Page</field>
+            <field name="text_area">== Question ==
+
+What's the Document Management System ?
+
+== Answer ==
+
+The document management system allows you to store, classify, and search your
+enterprise's documents. This module (called '''document''') provides an FTP access to all your ERP's
+ressources.  For a dynamic and efficient classification, the folders structure
+is provided by others objects.  It is very usefull to track documents related
+to projects, products, sales, contracts, etc.
+
+Keypoints:
+
+* FTP Access
+* Indexation of PDF, DOC, ODT.
+* Virtual files and folders
+
+Integration Benefits:
+
+* Stores automatically ERP reports
+* Automatic classification of ressources
+* Shared access rights for DMS and ERP
+* Store emails with outlook Plugin
+
+== External Links ==
+
+* The Open ERP Website : [http://openerp.com]
+* The DMS Documentation : [http://openerp.com]
+
+            </field>
+        </record>
+
+        <record id="wiki_wiki_crm" model="wiki.wiki">
+            <field name="name">Customer Relationship Management ?</field>
+            <field name="tags">crm</field>
+            <field name="group_id" ref="wiki_groups_faq"/>
+            <field name="minor_edit">0</field>
+            <field name="toc">1</field>
+            <field name="section">1</field>
+            <field name="summary">Initial Page</field>
+            <field name="text_area">== Question ==
+
+What's the Customer Relationship Management ?
+
+== Answer ==
+
+Customer Relationship Management system enables a group of people to intelligently
+and efficiently manage leads, opportunities, meeting, phonecall etc.
+It manages key tasks such as communication, identification, prioritization,
+assignment, resolution and notification.
+
+Keypoints:
+
+* Automatic incoming and outgoing email processing using the mail gateway
+* A generic and fully customizable system
+* A configuration wizard to help you setup it as per your requirements.
+
+Integration Benefits:
+
+* Integrated with the enterprise calendars,
+* Integrated with sales, purchases and after-sales services,
+* Get your enterprise processes running through workflows.
+
+
+== External Links ==
+
+* The Open ERP Website : [http://openerp.com]
+* The DMS Documentation : [http://openerp.com]
+
+            </field>
+        </record>
+      </data>
+</openerp>

From 9ba6f6ca86280a369af7c648da947c76d07f3bcd Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 24 May 2010 10:34:52 +0530
Subject: [PATCH 4/6] [IMP] Apply changes in search view

bzr revid: ksa@tinyerp.co.in-20100524050452-ejojxuazb72l6tev
---
 .../report/account_analytic_report_view.xml   | 27 +++---
 .../report/account_invoice_report_view.xml    | 43 ++++-----
 addons/audittrail/audittrail.py               | 28 ++++++
 addons/base_calendar/base_calendar_view.xml   | 30 +++----
 .../base_module_record/base_module_record.py  | 46 +++++-----
 addons/crm/crm_installer.py                   | 17 ++--
 addons/crm/crm_installer_view.xml             |  1 +
 addons/crm/crm_lead_view.xml                  |  2 +-
 addons/crm/crm_meeting_view.xml               |  4 +-
 addons/crm/crm_opportunity_view.xml           |  8 +-
 addons/crm/crm_phonecall_view.xml             | 14 +--
 addons/crm/report/crm_lead_report_view.xml    | 70 +++++++--------
 .../crm/report/crm_phonecall_report_view.xml  | 66 +++++++-------
 addons/crm_claim/crm_claim_view.xml           |  2 +-
 .../report/crm_claim_report_view.xml          | 83 +++++++++--------
 .../crm_fundraising/crm_fundraising_view.xml  |  2 +-
 .../report/crm_fundraising_report_view.xml    | 66 +++++++-------
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  2 +-
 .../report/crm_helpdesk_report_view.xml       | 54 ++++++------
 addons/document/document_data.xml             | 10 ++-
 addons/document/document_view.xml             |  7 +-
 .../report/hr_evaluation_report_view.xml      | 25 +++---
 .../report/hr_expense_report_view.xml         | 31 +++----
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 .../report/hr_recruitment_report_view.xml     | 33 +++----
 .../hr_timesheet_invoice_report_view.xml      | 25 +++---
 .../report/timesheet_report_view.xml          | 27 +++---
 .../mrp/report/mrp_production_order_view.xml  | 34 +++----
 addons/product/product_view.xml               |  9 +-
 addons/project/report/project_report_view.xml | 31 +++----
 .../report/project_issue_report_view.xml      | 88 +++++++++----------
 .../purchase/report/purchase_report_view.xml  | 32 +++----
 addons/sale/report/sale_report_view.xml       | 34 +++----
 addons/wiki/wiki_view.xml                     | 11 +++
 34 files changed, 516 insertions(+), 448 deletions(-)

diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index de97bfcb798..4c19e0caee9 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -53,7 +53,20 @@
 	                <field name="partner_id"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                    <filter string="User" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
+                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                </group>
+
+                <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-account"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
@@ -78,18 +91,6 @@
                     <field name="date_end"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="User" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 5a833e454fb..bb08e92af5c 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -92,26 +92,7 @@
 				<field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter string="Done"
-                   			icon="terp-account"
-                   			domain="[('state','=','paid')]"
-                   			help = "Done tasks"/>
-                   	<filter string="Cancelled"
-                		icon="terp-account"
-                		domain="[('state', '=' ,'cancel')]"
-                		help = "Cancelled tasks"/>
-                	<separator orientation="vertical"/>
-                	<field name="payment_term" widget="selection"/>
-                	<field name="currency_id" widget="selection"/>
-                	<field name="journal_id" widget="selection"/>
-                	<newline/>
-            		<field name="type"/>
-                	<field name="period_id" widget="selection"/>
-                	<field name="fiscal_position" widget="selection"/>
-					<field name="date"/>
-                </group>
-                <newline/>
+
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
@@ -132,6 +113,28 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                	<filter string="Done"
+                   			icon="terp-account"
+                   			domain="[('state','=','paid')]"
+                   			help = "Done tasks"/>
+                   	<filter string="Cancelled"
+                		icon="terp-account"
+                		domain="[('state', '=' ,'cancel')]"
+                		help = "Cancelled tasks"/>
+                	<separator orientation="vertical"/>
+                	<field name="payment_term" widget="selection"/>
+                	<field name="currency_id" widget="selection"/>
+                	<field name="journal_id" widget="selection"/>
+                	<newline/>
+            		<field name="type"/>
+                	<field name="period_id" widget="selection"/>
+                	<field name="fiscal_position" widget="selection"/>
+					<field name="date"/>
+                </group>
+
             </search>
         </field>
     </record>
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 39930dceca8..0c212005317 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -533,6 +533,34 @@ class audittrail_objects_proxy(osv_pool):
 
         cr.close()
 
+        def exec_action(self, db, uid, object, action, *args, **argv):
+            print "actionnnnnnnnnnn"
+            pool = pooler.get_pool(db)
+            cr = pooler.get_db(db).cursor()
+            cr.autocommit(True)
+            logged_uids = []
+            fct_src = super(audittrail_objects_proxy, self).exec_action
+            field = method
+            rule = False
+            obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+            for obj_name in pool.obj_list():
+                if obj_name == 'audittrail.rule':
+                    rule = True
+            rule_ids = pool.get('audittrail.rule').search(cr, uid, [('object_id', '=', obj_ids[0]), ('state', '=', 'subscribed')])
+            if not rule_ids:
+                 return super(audittrail_objects_proxy, self).exec_action(db, uid, object, action, *args, **argv)
+
+            for thisrule in pool.get('audittrail.rule').browse(cr, uid, rule_ids):
+                for user in thisrule.user_id:
+                    logged_uids.append(user.id)
+                if not logged_uids or uid in logged_uids:
+                     if thisrule.log_workflow:
+                   #      return self.workflow_log(db, uid, object, method, *args,**argv)
+                            return super(audittrail_objects_proxy, self).exec_action(db, uid, object, action, *args, **argv)
+
+            cr.close()
+
+
 audittrail_objects_proxy()
 
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 0c8a52260ef..a9cc6f9b750 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -102,8 +102,8 @@
                </search>
             </field>
         </record>
-        
-        
+
+
 		<record id="action_view_attendee_form" model="ir.actions.act_window">
 	         <field name="name">Event Invitations</field>
 	         <field name="type">ir.actions.act_window</field>
@@ -113,11 +113,11 @@
 	         <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"
 			name="Event Invitations" parent="base.menu_calendar_configuration"
@@ -161,8 +161,8 @@
                 </tree>
             </field>
         </record>
-            
-		
+
+
         <record id="action_res_alarm_view" model="ir.actions.act_window">
             <field name="name">Available Alarms</field>
             <field name="type">ir.actions.act_window</field>
@@ -176,8 +176,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>
@@ -338,7 +338,7 @@
 	            </tree>
 	        </field>
 	    </record>
-	    
+
 		<!-- Event Calendar View  -->
 
 		<record model="ir.ui.view" id="event_calendar_view">
@@ -354,9 +354,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>
@@ -377,7 +377,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"
@@ -394,7 +394,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>
@@ -403,11 +403,11 @@
 	            <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_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 9eb3f2eda7f..a48bf6841cc 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -43,12 +43,12 @@ class recording_objects_proxy(osv_pool):
         res = super(recording_objects_proxy, self).execute(*args, **argv)
         pool = pooler.get_pool(args[0])
         mod = pool.get('ir.module.record')
-        
+
         if mod and mod.recording:
             if args[3] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink'):
                 if _old_args is not None:
                     if args[3] != 'write' and args[3] != 'create' and len(args) > 5 and isinstance(args[5], dict):
-                       args=list(args) 
+                       args=list(args)
                        args[5]=_old_args
                        args=tuple(args)
                        mod.recording_data.append(('osv_memory_action', args, argv ,None))
@@ -69,7 +69,7 @@ class recording_objects_proxy(osv_pool):
         return res
 
 recording_objects_proxy()
-      
+
 class xElement(minidom.Element):
     """dom.Element with compact print
     The Element in minidom has a problem: if printed, adds whitespace
@@ -88,7 +88,7 @@ def doc_createXElement(xdoc, tagName):
         return e
 
 import yaml
-            
+
 class record(yaml.YAMLObject):
     yaml_tag = u'!record'
     def __init__(self, model, id=None, attrs={}):
@@ -106,7 +106,7 @@ class workflow(yaml.YAMLObject):
         self.action=action
     def __repr__(self):
         return '!workflow {model: %s, action: %s, ref: %s}' % (str(self.model,), str(self.action,), str(self.ref,))
-        
+
 class ref(yaml.YAMLObject):
     yaml_tag = u'!ref'
     def __init__(self, expr="False"):
@@ -129,7 +129,7 @@ class function(yaml.YAMLObject):
         self.attrs=attrs
     def __repr__(self):
         return '!python {model: %s}: |' % (str(self.model), )
-    
+
 class base_module_record(osv.osv):
     _name = "ir.module.record"
     _columns = {
@@ -169,16 +169,16 @@ class base_module_record(osv.osv):
         obj = dt.browse(cr, uid, dtids[0])
         self.depends[obj.module] = True
         return obj.module+'.'+obj.name, obj.noupdate
-    
+
     def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False):
         data_pool = self.pool.get('ir.model.data')
         model_pool = self.pool.get(model)
-        
+
         record = doc.createElement('record')
         record.setAttribute("id", record_id)
         record.setAttribute("model", model)
         record_list = [record]
-        
+
         lids  = data_pool.search(cr, uid, [('model','=',model)])
         res = data_pool.read(cr, uid, lids[:1], ['module'])
         if res:
@@ -207,7 +207,7 @@ class base_module_record(osv.osv):
                     noupdate = noupdate or update
                 if not id:
                     relation_pool = self.pool.get(fields[key]['relation'])
-                    
+
                     field.setAttribute("model", fields[key]['relation'])
                     fld_nm = relation_pool._rec_name
                     name = relation_pool.read(cr, uid, val,[fld_nm])[fld_nm] or False
@@ -231,7 +231,7 @@ class base_module_record(osv.osv):
                                 newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
                                 valitem[1]=newid
                         self.ids[(fields[key]['relation'], valitem[1])] = newid
-                        
+
                         childrecord, update = self._create_record(cr, uid, doc, fields[key]['relation'],valitem[2], newid)
                         noupdate = noupdate or update
                         record_list += childrecord
@@ -260,11 +260,11 @@ class base_module_record(osv.osv):
 
     def _create_yaml_record(self, cr, uid, model, data, record_id):
         record={'model': model, 'id': str(record_id)}
-        
+
         model_pool = self.pool.get(model)
         data_pool = self.pool.get('ir.model.data')
         lids  = data_pool.search(cr, uid, [('model','=',model)])
-        
+
         res = data_pool.read(cr, uid, lids[:1], ['module'])
         attrs={}
         if res:
@@ -275,7 +275,7 @@ class base_module_record(osv.osv):
             defaults[model] = model_pool.default_get(cr, uid, data)
         except:
             defaults[model]={}
-        for key,val in data.items():  
+        for key,val in data.items():
             if ((key in defaults[model]) and (val ==  defaults[model][key])) and not(fields[key].get('required',False)):
                 continue
             if fields[key]['type'] in ('integer','float'):
@@ -303,7 +303,7 @@ class base_module_record(osv.osv):
                         else:
                             fname = model_pool._inherit_fields[key][2]._fields_id
                         del valitem[2][fname] #delete parent_field from child's fields list
-                        
+
                         childrecord = self._create_yaml_record(cr, uid, fields[key]['relation'],valitem[2], None)
                         items[0].append(childrecord['attrs'])
                 attrs[key] = items
@@ -343,7 +343,7 @@ class base_module_record(osv.osv):
         for f in filter(lambda a: isinstance(obj._columns[a], fields.function)\
                     and (not obj._columns[a].store),obj._columns):
             del data[f]
-            
+
         for key,val in data.items():
             if result.has_key(key):
                 continue
@@ -378,6 +378,7 @@ class base_module_record(osv.osv):
         return result
 
     def _create_function(self, cr, uid, doc, model, name, record_id):
+        print "creareeeeeeeeeeeeeeeeee"
         record = doc.createElement('function')
         record.setAttribute("name", name)
         record.setAttribute("model", model)
@@ -402,7 +403,7 @@ class base_module_record(osv.osv):
                 record,update = self._create_record(cr, uid, doc, rec[2], rec[5], id)
                 noupdate = noupdate or update
                 record_list += record
-                
+
         elif rec[4] in ('menu_create',):
             for id in rec[5]:
                 id,update = self._get_id(cr, uid, rec[3], id)
@@ -460,6 +461,7 @@ class base_module_record(osv.osv):
         return record
 
     def _generate_function_yaml(self, cr, uid, args):
+        print "geberareeeeeeeeeeeeeeee",args
         db, uid, model, action, ids, context = args
         temp_context = context.copy()
         active_id = temp_context['active_id']
@@ -484,7 +486,7 @@ class base_module_record(osv.osv):
         attrs=str(attrs)+'})'
         function['attrs'] = attrs
         return function
-            
+
     def _generate_assert_xml(self, rec, doc):
         pass
 
@@ -526,7 +528,7 @@ class base_module_record(osv.osv):
         self.ids = {}
         if len(self.recording_data):
             yaml_file='''\n'''
-    
+
             for rec in self.recording_data:
                 if rec[1][3] == 'create':
                     self.mode="create"
@@ -565,21 +567,21 @@ class base_module_record(osv.osv):
                     yaml_file += str(object) + '''\n'''
                     attrs=yaml.dump(object.attrs, default_flow_style=False)
                     yaml_file += attrs + '''\n\n'''
-                    
+
         yaml_result=''''''
         for line in yaml_file.split('\n'):
             line=line.replace("''","'")
             if (line.find('!record') == 0) or (line.find('!workflow') == 0) or (line.find('!python') == 0):
                 line = "- \n" + "  " + line
             elif line.find('!comment') == 0:
-                line=line.replace('!comment','- \n ')   
+                line=line.replace('!comment','- \n ')
             elif line.find('- -') != -1:
                 line=line.replace('- -','  -')
                 line = "    " + line
             else:
                 line = "    " + line
             yaml_result += line + '''\n'''
-            
+
         return yaml_result
 
 base_module_record()
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 1d9235feac6..d915b2082b7 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -30,18 +30,19 @@ import tools
 class crm_installer(osv.osv_memory):
     _name = 'crm.installer'
     _inherit = 'res.config.installer'
-    
+
     _columns = {
-        'name': fields.char('Name', size=64), 
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."), 
-        'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), 
+        'name': fields.char('Name', size=64),
+        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
+        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."),
+        'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."),
         'sale_crm': fields.boolean('Create Quotation from Opportunity', help="This module relates sale to opportunity cases in the CRM."),
+        'wiki_sale_faq': fields.boolean('Sales FAQ', help="This module relates to Document & CRM."),
         'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
-        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),  
+        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),
     }
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(crm_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         #Checking sale module is installed or not
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 370285352d1..9986e247232 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -36,6 +36,7 @@
 	          	<field name="crm_helpdesk" />
 	          	<field name="crm_fundraising" />
 	          	<field name="sale_crm" invisible="1"/>
+	          	<field name="wiki_sale_faq"/>
           </group>
           </group>
         </data>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f521f734b1f..8f5769dcb01 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -309,7 +309,7 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="14">
+                <group expand="1" string="Group By..." colspan="14">
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 803e0ffedbe..b0d5364ab07 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -281,7 +281,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"
@@ -327,7 +327,7 @@
                     </field>
                 </field>
         </record>
-        
+
         <!--  Partners inherited form -->
 
 		<record id="view_meeting_partner_info_form" model="ir.ui.view">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 38e12d7a6b8..b61ef69da3c 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -306,7 +306,7 @@
                         help="My section" />
                 </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="[]"
@@ -326,7 +326,7 @@
            </search>
         </field>
     </record>
-    
+
     <!--  Partners inherited form -->
 
 		<record id="view_opp_partner_info_form" model="ir.ui.view">
@@ -343,11 +343,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 3bfa284b017..10d1a824aa8 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>
@@ -277,7 +277,7 @@
                        help="My section" />
                </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"
@@ -291,9 +291,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>
@@ -305,6 +305,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 c1d64ee332c..09c6ab75039 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -119,7 +119,41 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+
+                   <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="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="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -132,40 +166,6 @@
 			                <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'}" />
-
-                        <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="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/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 72bc4847608..def6a0ce67e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -63,7 +63,7 @@
         </record>
 
 <!-- Phone calls by user and section Search View -->
-	
+
 	<record id="view_report_crm_phonecall_filter" model="ir.ui.view">
             <field name="name">crm.phonecall.report.select</field>
             <field name="model">crm.phonecall.report</field>
@@ -118,8 +118,39 @@
 	            			<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')]"/>
@@ -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>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 4228096e670..62838086104 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -279,7 +279,7 @@
                            help="My section" />
                    </field>
                    <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 6f906f3d21f..edf813ed237 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -67,7 +67,7 @@
         </record>
 
 <!-- CRM Claim Report Search View -->
-		
+
 		<record id="view_report_crm_claim_filter" model="ir.ui.view">
             <field name="name">crm.claim.report.select</field>
             <field name="model">crm.claim.report</field>
@@ -122,8 +122,47 @@
 	            			<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="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">
                          <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>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9a2b3b4c524..0d7c49b38c5 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -291,7 +291,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 73f35ddba50..31c97063aa6 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')]"/>
@@ -130,44 +160,12 @@
                     	<filter icon="terp-sale"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
-                    	
+
                     	<group>
 		            	    <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 93311395510..2da46c287a0 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -247,7 +247,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 a8857c0d557..0d5f3a4a94e 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,36 +114,13 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Extended options..." 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 -->
+                   <!-- 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 +146,31 @@
                             domain="[]" context="{'group_by':'name'}" />
 
                   </group>
+
+                   <group expand="0" string="Extended options..." 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/>
+
                </search>
             </field>
         </record>
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index 77c80b078d1..db663e2c5de 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -7,7 +7,7 @@
         <field name="name">PDF Report</field>
         <field name="mimetype">application/pdf</field>
     </record>
-    
+
     <record model="document.storage" id="storage_default">
 	<field name="name">Default File storage</field>
 	<field name="user_id" ref="base.user_admin"/>
@@ -33,7 +33,7 @@
         <field name="user_id" ref="base.user_admin"/>
 	<field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
- 
+
     </record>
 
     <record model="document.directory" id="dir_partner_category">
@@ -106,7 +106,13 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
+    </record>
 
+    <record model="document.directory" id="dir_sale">
+        <field name="name">Sales Document</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="parent_id" ref="dir_root"/>
+        <field name="ressource_id">0</field>
     </record>
 
 </data>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 69c000e89a6..564cfa21bbd 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -71,7 +71,7 @@
                     <newline/>
                     <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
                     <field name="ressource_tree"/>
-					<field name="resource_field" 	domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
+					<field name="resource_field" domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
                     <field name="ressource_id" select="2" readonly="1"/>
                     <field name="ressource_parent_type_id"/>
                 </page>
@@ -252,6 +252,7 @@
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
     </record>
+
     <menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
     <menuitem
         name="Documents"
@@ -313,6 +314,10 @@
         </field>
     </record>
 
+     <menuitem parent="menu_document_doc"
+            id="menu_action_wiki_wiki" name="FAQ"
+            action="wiki.action_wiki_test" />
+
     <act_window domain="[('partner_id', '=', active_id)]"
         id="act_res_partner_document" name="Related Documents"
         res_model="ir.attachment"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 0dacc90c53c..bbfa704c2e3 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -71,6 +71,19 @@
 	                <field name="employee_id" widget="selection"/>
                 </group>
                 <newline/>
+
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="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">
                 	<filter icon="terp-hr"
                     		string="Done"
@@ -87,18 +100,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 c376df3e4d7..add9db911f5 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -85,6 +85,22 @@
                     </field>
 				</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="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <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':'date'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
+                <newline/>
 				<group expand="0" string="Extended options..." colspan="10" col="12">
 					<filter string="Invoiced"
 	                   		icon="terp-hr"
@@ -109,21 +125,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="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-                    <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':'date'}"/>
-                    <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 617bcea4dbe..72e0bc4514e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -233,7 +233,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 8e0c3f0845a..072704d2cda 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -95,7 +95,23 @@
                 </field>
                 </group>
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
+
+                <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="Stage" name="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
+                   <separator orientation="vertical"/>
+                   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
+                   <filter string="Jobs" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
+                   <separator orientation="vertical"/>
+                   <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>
+
+                <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-hr"
                     		string="Hired"
                         name="done"
@@ -113,20 +129,7 @@
                     <field name="date_closed"/>
                 </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="Stage" name="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
-                   <filter string="Jobs" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
-            	   <separator orientation="vertical"/>
-            	   <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>
         </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 cb6c8d5771c..1124b00670b 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
@@ -74,23 +74,26 @@
                         <field name="product_id"/>
                     </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>
+
 	                <group expand="0" string="Extended options..." colspan="10" col="12">
 	                    <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 976b2a6f8ea..120e335d9e7 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -80,7 +80,20 @@
 	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <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="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                        <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-hr" context="{'group_by':'date_current'}"/>
+                        <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                    </group>
+                    <newline/>
+
+                    <group expand="0" string="Extended options..." colspan="10" col="12">
                 	<filter icon="terp-hr"
                     		string="New"
                     		domain="[('state','=','new')]"/>
@@ -89,18 +102,6 @@
                     <separator orientation="vertical"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                </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="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-	                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-hr" context="{'group_by':'date_current'}"/>
-	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index a97abe846de..7c25d2d9f0b 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 options..." colspan="10" col="12">
+
+                   <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':'name'}"/>
+                   </group>
+
+	                <group expand="0" string="Extended options..." colspan="10" col="12">
 	                    <filter icon="terp-mrp" string="Draft" domain="[('state','=','draft')]"/>
 	                    <filter icon="terp-mrp" string="Picking Exception" domain="[('state','=','picking_except')]"/>
 	                    <separator orientation="vertical"/>
@@ -78,20 +93,7 @@
 						<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':'name'}"/>
-                   </group>
-               </search>
+                  </search>
             </field>
         </record>
         <record id="action_report_mrp_production_order" model="ir.actions.act_window">
@@ -102,7 +104,7 @@
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
           <field name="context">{'search_default_Product': 1}</field>
-            
+
         </record>
 
        	<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7cdc271d31c..abceb8b6056 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -17,11 +17,6 @@
                    <field name="default_code" select="1"/>
                    <field name="name" select="1"/>
                    <field name="categ_id" select="1" widget="selection" operator="child_of"/>
-                   <newline/>
-                   <group col='8' colspan='14' expand="1" string="Extended options..." groups="base.group_extended">
-                       <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
-                   </group>
-                   <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"/>
@@ -29,6 +24,10 @@
                        <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" select="1" 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 a4a072849b9..e94d3a364d5 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -99,6 +99,22 @@
 	                        		domain="[('project_id','=',False"/>
 	                    </field>
                     </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'}"/>
+                        <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
+                        <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
+                        <filter string="Stage" icon="terp-project" context="{'group_by':'type'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-project" context="{'group_by':'day'}"/>
+                        <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">
                       	<filter string="Done"
@@ -118,21 +134,6 @@
 	                    <field name="date_start"/>
 	                    <field name="date_end"/>
                     </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'}"/>
-                        <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
-                        <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
-                        <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Stage" icon="terp-project" context="{'group_by':'type'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-project" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
-                    </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 a9f8f016dec..65875cf2c2d 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -98,8 +98,51 @@
 	            			<filter icon="terp-crm" string="My Project Issue" help="My Project Issue Entries" 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'}" />
+
+                        <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
+                        <filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
+                        <newline/>
+                        <filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
+                        <filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_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')]"/>
@@ -130,49 +173,6 @@
                         </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'}" />
-						
-						<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
-	            		<separator orientation="vertical"/>
-	            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
-	            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
-	            		<separator orientation="vertical"/>
-	            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
-	            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
-	            		<newline/>
-	            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
-	            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-	            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_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/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 93918160bd1..2255ec87f6b 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -86,6 +86,22 @@
 
 				</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'}"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <filter string="Partner" 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'}"/>
+                    <separator orientation="vertical"/>
+                    <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 options..." colspan="10" col="12">
                     <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
@@ -101,22 +117,6 @@
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <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'}"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
-                    <filter string="Partner" 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'}"/>
-                    <separator orientation="vertical"/>
-                    <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 72707f6e01d..8192eff7c9a 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -85,6 +85,23 @@
 	                <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="Day" icon="terp-sale" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-sale" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                </group>
+                <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-sale" string="       Invoice Exception      " domain="[('state','=','invoice_except')]"/>
@@ -100,23 +117,6 @@
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="date"/>
                 </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="Day" icon="terp-sale" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'date'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 79194659b34..4e0b8b4b6db 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -180,6 +180,17 @@
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
 
+        <record model="ir.actions.act_window" id="action_wiki_test">
+            <field name="name">Wiki Pages</field>
+            <field name="res_model">wiki.wiki</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="context">{'section':'1'}</field>
+            <field name="search_view_id" ref="view_wiki_filter"/>
+            <field name="domain">[('group_id', '=', 'Internal FAQ')]</field>
+        </record>
+
         <menuitem parent="base.menu_document2"
             id="menu_action_wiki_wiki" name="Wiki Pages"
             action="action_wiki" />

From 66346567019ab30fb0b14adb6f2928ccef971dd1 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 24 May 2010 19:11:35 +0530
Subject: [PATCH 5/6] [IMP] Improvement for Sales menu usability

bzr revid: ksa@tinyerp.co.in-20100524134135-17k8zhf10mdt09rm
---
 addons/base_vat/base_vat_view.xml | 7 ++++---
 addons/crm/crm_view.xml           | 3 ++-
 addons/sale/sale_view.xml         | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index 325c2c1ea4c..2f5303be7a1 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -7,10 +7,11 @@
       <field name="model">res.partner</field>
       <field name="inherit_id" ref="account.view_partner_property_form"/>
       <field name="arch" type="xml">
-        <field name="property_account_payable" position="after">
+        <field name="property_payment_term" position="after">
             <group colspan="2" col="6">
-              <field name="vat" on_change="vat_change(vat)" colspan="4" />
-              <field name="vat_subjected" colspan="1"/>
+              <separator string="Text Accounting Properties" colspan="6"/>
+              <field name="vat" on_change="vat_change(vat)"/>
+              <field name="vat_subjected"/>
             </group>
         </field>
       </field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 79e1fc3496b..fcf423c6b46 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -160,7 +160,8 @@
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act"
-            parent="base.menu_crm_configuration" />
+            parent="base.menu_crm_configuration"
+            groups="base.group_extended" />
 
 
 <!-- Resource Type of case Tree View -->
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3b6886cfacf..638466eb5f4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -107,9 +107,9 @@
                     <notebook colspan="4">
                         <page string="Sale Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
+                            <field name="partner_order_id" widget="selection"/>
+                            <field name="partner_invoice_id" widget="selection"/>
+                            <field name="partner_shipping_id" widget="selection"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" widget="selection"/>
                             <field name="project_id"
                                 context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
@@ -451,7 +451,7 @@
                         name="unshipped"
                         separator="1" />
                     <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
-                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" 
+                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
                         separator="1" />
                     <separator orientation="vertical"/>
                     <field name="order_id"/>

From 631cdfc3c6ea9afab23293887193ee01542d7382 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 25 May 2010 17:43:26 +0530
Subject: [PATCH 6/6] [ADD]: wiki_sale_faq: create new module wiki_sale_faq

bzr revid: ksa@tinyerp.co.in-20100525121326-wy3nz51vmhbnlkey
---
 addons/wiki_sale_faq/__openerp__.py     |   2 +-
 addons/wiki_sale_faq/wiki_sale_demo.xml | 111 +++++++++++++++++++++++
 addons/wiki_sale_faq/wiki_sale_faq.xml  | 114 ++++++------------------
 3 files changed, 138 insertions(+), 89 deletions(-)
 create mode 100644 addons/wiki_sale_faq/wiki_sale_demo.xml

diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 477a1282bd4..d31111faa63 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -30,7 +30,7 @@
     'depends': ['wiki','document','crm'],
     'init_xml': [],
     'update_xml': ['wiki_sale_faq.xml'],
-    'demo_xml': [],
+    'demo_xml': ['wiki_sale_demo.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/wiki_sale_faq/wiki_sale_demo.xml b/addons/wiki_sale_faq/wiki_sale_demo.xml
new file mode 100644
index 00000000000..a7f53bdbe8a
--- /dev/null
+++ b/addons/wiki_sale_faq/wiki_sale_demo.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+    <record model="document.directory" id="dir_sale">
+        <field name="name">Sales Document</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="parent_id" ref="document.dir_root"/>
+        <field name="ressource_id">0</field>
+    </record>
+
+    <record model="ir.attachment" id="attachment_data">
+            <field name="name">Sales File</field>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="title">Sales Document</field>
+            <field name="parent_id" ref="dir_sale"/>
+        </record>
+         <record id="wiki_groups_faq" model="wiki.groups">
+            <field name="name">Sales FAQ</field>
+            <field name="method">list</field>
+            <field eval="2" name="section"/>
+            <field name="template">== Question ==
+
+== Answer ==
+
+== External Links ==
+
+            </field>
+        </record>
+        <record id="wiki_wiki_dms" model="wiki.wiki">
+            <field name="name">Document Management System ?</field>
+            <field name="tags">dms, document</field>
+            <field name="group_id" ref="wiki_groups_faq"/>
+            <field name="minor_edit">0</field>
+            <field name="toc">1</field>
+            <field name="section">1</field>
+            <field name="summary">Initial Page</field>
+            <field name="text_area">== Question ==
+
+What's the Document Management System ?
+
+== Answer ==
+
+The document management system allows you to store, classify, and search your
+enterprise's documents. This module (called '''document''') provides an FTP access to all your ERP's
+ressources.  For a dynamic and efficient classification, the folders structure
+is provided by others objects.  It is very usefull to track documents related
+to projects, products, sales, contracts, etc.
+
+Keypoints:
+
+* FTP Access
+* Indexation of PDF, DOC, ODT.
+* Virtual files and folders
+
+Integration Benefits:
+
+* Stores automatically ERP reports
+* Automatic classification of ressources
+* Shared access rights for DMS and ERP
+* Store emails with outlook Plugin
+
+== External Links ==
+
+* The Open ERP Website : [http://openerp.com]
+* The DMS Documentation : [http://openerp.com]
+
+            </field>
+        </record>
+
+        <record id="wiki_wiki_crm" model="wiki.wiki">
+            <field name="name">Customer Relationship Management ?</field>
+            <field name="tags">crm</field>
+            <field name="group_id" ref="wiki_groups_faq"/>
+            <field name="minor_edit">0</field>
+            <field name="toc">1</field>
+            <field name="section">1</field>
+            <field name="summary">Initial Page</field>
+            <field name="text_area">== Question ==
+
+What's the Customer Relationship Management ?
+
+== Answer ==
+
+Customer Relationship Management system enables a group of people to intelligently
+and efficiently manage leads, opportunities, meeting, phonecall etc.
+It manages key tasks such as communication, identification, prioritization,
+assignment, resolution and notification.
+
+Keypoints:
+
+* Automatic incoming and outgoing email processing using the mail gateway
+* A generic and fully customizable system
+* A configuration wizard to help you setup it as per your requirements.
+
+Integration Benefits:
+
+* Integrated with the enterprise calendars,
+* Integrated with sales, purchases and after-sales services,
+* Get your enterprise processes running through workflows.
+
+
+== External Links ==
+
+* The Open ERP Website : [http://openerp.com]
+* The DMS Documentation : [http://openerp.com]
+
+            </field>
+        </record>
+
+        </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki_sale_faq/wiki_sale_faq.xml b/addons/wiki_sale_faq/wiki_sale_faq.xml
index c3ae55a0f0e..350ad0a4c77 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq.xml
@@ -1,100 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data noupdate="1">
-        <menuitem name="Sales Management" icon="terp-stock"
-           id="base.menu_document" sequence="4" />
+    <data>
+        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
-         <record id="wiki_groups_faq" model="wiki.groups">
-            <field name="name">Internal FAQ</field>
-            <field name="method">list</field>
-            <field eval="2" name="section"/>
-            <field name="template">== Question ==
+        <menuitem name="Documents"
+           id="menu_sales" sequence="6"
+           parent="base.menu_base_partner"/>
 
-== Answer ==
+       <record model="ir.actions.act_window" id="action_document_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('parent_id','=','Sales Document')]</field>
+    </record>
 
-== External Links ==
-
-            </field>
-        </record>
-        <record id="wiki_wiki_dms" model="wiki.wiki">
-            <field name="name">Document Management System ?</field>
-            <field name="tags">dms, document</field>
-            <field name="group_id" ref="wiki_groups_faq"/>
-            <field name="minor_edit">0</field>
-            <field name="toc">1</field>
-            <field name="section">1</field>
-            <field name="summary">Initial Page</field>
-            <field name="text_area">== Question ==
-
-What's the Document Management System ?
-
-== Answer ==
-
-The document management system allows you to store, classify, and search your
-enterprise's documents. This module (called '''document''') provides an FTP access to all your ERP's
-ressources.  For a dynamic and efficient classification, the folders structure
-is provided by others objects.  It is very usefull to track documents related
-to projects, products, sales, contracts, etc.
-
-Keypoints:
-
-* FTP Access
-* Indexation of PDF, DOC, ODT.
-* Virtual files and folders
-
-Integration Benefits:
-
-* Stores automatically ERP reports
-* Automatic classification of ressources
-* Shared access rights for DMS and ERP
-* Store emails with outlook Plugin
-
-== External Links ==
-
-* The Open ERP Website : [http://openerp.com]
-* The DMS Documentation : [http://openerp.com]
-
-            </field>
+         <record model="ir.actions.act_window" id="action_wiki_test">
+            <field name="name">Wiki Pages</field>
+            <field name="res_model">wiki.wiki</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('group_id','=','Sales FAQ')]</field>
+            <field name="search_view_id" ref="wiki.view_wiki_filter"/>
         </record>
 
-        <record id="wiki_wiki_crm" model="wiki.wiki">
-            <field name="name">Customer Relationship Management ?</field>
-            <field name="tags">crm</field>
-            <field name="group_id" ref="wiki_groups_faq"/>
-            <field name="minor_edit">0</field>
-            <field name="toc">1</field>
-            <field name="section">1</field>
-            <field name="summary">Initial Page</field>
-            <field name="text_area">== Question ==
+        <menuitem
+        name="Documents"
+        action="action_document_form"
+        id="menu_document_files"
+        parent="menu_sales"/>
 
-What's the Customer Relationship Management ?
-
-== Answer ==
-
-Customer Relationship Management system enables a group of people to intelligently
-and efficiently manage leads, opportunities, meeting, phonecall etc.
-It manages key tasks such as communication, identification, prioritization,
-assignment, resolution and notification.
-
-Keypoints:
-
-* Automatic incoming and outgoing email processing using the mail gateway
-* A generic and fully customizable system
-* A configuration wizard to help you setup it as per your requirements.
-
-Integration Benefits:
-
-* Integrated with the enterprise calendars,
-* Integrated with sales, purchases and after-sales services,
-* Get your enterprise processes running through workflows.
+        <menuitem parent="menu_sales"
+            id="menu_action_wiki_wiki" name="FAQ"
+            action="action_wiki_test" />
 
 
-== External Links ==
-
-* The Open ERP Website : [http://openerp.com]
-* The DMS Documentation : [http://openerp.com]
-
-            </field>
-        </record>
       </data>
 </openerp>