diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 34c5b9ede9a..b5db01ac512 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -70,8 +70,8 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees':fields.integer('Expected Employees'),
-        'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer'),
+        'expected_employees':fields.integer('Expected Employees', help='Required number of Employees'),
+        'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer', help='Number of Employees selected'),
         'employee_ids':fields.one2many('hr.employee', 'job_id','Employees'),
         'description': fields.text('Job Description'),
         'requirements':fields.text('Requirements'),
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 70576149592..c0b2e3c53c7 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -49,9 +49,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <group col='4' colspan='2'>
-                        <field name="name" />
-                        <field name="manager_id"/>
+                    <field name="name"/>
+                    <field name="manager_id" />
+                    <newline />
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 64ac0e27a48..f03058dccc7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -42,7 +42,7 @@
                 <form string="Employee">
                     <group colspan="4" col="8">
                         <group colspan="6" col="6">
-                            <field colspan="6" name="name" select="1"/>
+                            <field colspan="6" name="name" />
                             <field name="user_id"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="active" groups="base.group_extended"/>
@@ -120,7 +120,6 @@
                 <search string="Employees">
                     <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive"
                         groups="base.group_extended"/>
-                    <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
@@ -181,7 +180,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Marital Status">
-                    <field colspan="4" name="name" nolabel="1" select="1"/>
+                    <field name="name"/>
+                    <separator colspan="4" string="Description"/>
                     <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
@@ -250,8 +250,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Category">
-                    <field name="name" select="1"/>
-                    <field name="parent_id" select="1"/>
+                    <field name="name" />
+                    <field name="parent_id" />
                 </form>
             </field>
         </record>
@@ -328,8 +328,8 @@
             <field name="arch" type="xml">
                 <form string="Job">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="department_id" select="1"/>
+                        <field name="name" />
+                        <field name="department_id" />
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="expected_employees"/>
                         <field name="no_of_employee"/>
@@ -356,7 +356,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Job">
-                    <field name="name" select="1"/>
+                    <field name="name" />
                     <field name="department_id" />
                     <field name="expected_employees"/>
                     <field name="no_of_employee"/>
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
index e30d4107171..cfebc640777 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/bymonth.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -42,7 +42,7 @@ class report_custom(report_rml):
         month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
         user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
         for employee_id in ids:
-            emp = self.pool.get('hr.employee').read(cr, uid, 'read', [employee_id], ['name'])[0]
+            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['name'])[0]
             stop, days_xml = False, []
             user_repr = '''
             <user>
@@ -74,15 +74,15 @@ class report_custom(report_rml):
                     if att['action'] == 'sign_out':
                         wh += (dt - ldt).hours
                     ldt = dt
-                
+
                 # Week xml representation
                 wh = hour2str(wh)
                 today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, wh)
                 days_xml.append(today_xml)
                 today, tomor = tomor, tomor + one_day
-                
+
             user_xml.append(user_repr % '\n'.join(days_xml))
-        
+
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 9b428a6b54f..7319c366298 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -48,7 +48,7 @@ class report_custom(report_rml):
         user_xml = []
 
         for employee_id in ids:
-            emp = self.pool.get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
+            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
             monday, n_monday = first_monday, first_monday + one_week
             stop, week_xml = False, []
             user_repr = '''
@@ -71,7 +71,7 @@ class report_custom(report_rml):
                     attendances = cr.dictfetchall()
                     week_wh = {}
                     # Fake sign ins/outs at week ends, to take attendances across week ends into account
-                    # XXX this is wrong for the first sign-in ever and the last sign out to this date 
+                    # XXX this is wrong for the first sign-in ever and the last sign out to this date
                     if attendances and attendances[0]['action'] == 'sign_out':
                         attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
                     if attendances and attendances[-1]['action'] == 'sign_in':
@@ -96,10 +96,10 @@ class report_custom(report_rml):
                 week_repr.append('</week>')
                 if len(week_repr) > 21: # 21 = minimal length of week_repr
                     week_xml.append('\n'.join(week_repr))
-                
+
                 monday, n_monday = n_monday, n_monday + one_week
             user_xml.append(user_repr % '\n'.join(week_xml))
-        
+
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index a7a39312aff..7598543e302 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -12,6 +12,7 @@
                         <field name="name" />
                         <field name="state" />
                     </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-go-back" string="Sign in" name="si_check" type="object"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index e1135a9f058..16ceebb96b3 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -2,18 +2,6 @@
 <openerp>
     <data>
 
-        <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
-            <field name="name">hr.contract.wage.type.period.view.form</field>
-            <field name="model">hr.contract.wage.type.period</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wage Period">
-                    <field colspan="4" name="name"/>
-                    <field name="factor_days"/>
-                </form>
-            </field>
-        </record>
-
         <record id="hr_contract_wage_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.wage.type.view.form</field>
             <field name="model">hr.contract.wage.type</field>
@@ -37,26 +25,75 @@
                 <tree string="Wage Types">
                     <field name="name"/>
                     <field name="type"/>
+                    <field name="period_id" invisible="1"/>
                 </tree>
             </field>
         </record>
+
+        <record id="hr_contract_wage_type_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.view.search</field>
+            <field name="model">hr.contract.wage.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Wage Type">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                       <field name="type"/>
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                       <filter string="Period" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'period_id'}"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_wage_type" model="ir.actions.act_window">
             <field name="name">Contract Wage Type</field>
             <field name="res_model">hr.contract.wage.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
 
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
+        <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.period.view.form</field>
+            <field name="model">hr.contract.wage.type.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Wage Period">
+                    <field colspan="4" name="name"/>
+                    <field name="factor_days"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="hr_contract_wage_type_period_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.period.view.search</field>
+            <field name="model">hr.contract.wage.type.period</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Wage Period">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_wage_type_period" model="ir.actions.act_window">
             <field name="name">Wage period</field>
             <field name="res_model">hr.contract.wage.type.period</field>
             <field name="view_type">form</field>
+            <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_wage_type_period_view_search"/>
         </record>
+
         <menuitem
                 action="action_hr_contract_wage_type_period"
                 id="hr_menu_contract_wage_type_period"
@@ -181,7 +218,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contract Type">
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name"/>
                 </form>
             </field>
         </record>
@@ -196,11 +233,26 @@
                 </tree>
             </field>
         </record>
+
+        <record id="hr_contract_type_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.search</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Contract Type">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_type" model="ir.actions.act_window">
             <field name="name">Contract Types</field>
             <field name="res_model">hr.contract.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
 
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3c13a8ab63c..dd6de871d7a 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -271,14 +271,16 @@ class hr_evaluation_interview(osv.osv):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
         return True
 
-    def survey_req_done(self, cr, uid, ids, context={}):
+    def survey_req_done(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         self.write(cr, uid, ids, { 'state' : 'done'})
         hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
-        for id in self.browse(cr, uid, ids,context=context):
+        for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
             tot_done_req = 0
-            records = self.pool.get("hr_evaluation.evaluation").browse(cr, uid, [id.evaluation_id.id],context=context)[0].survey_request_ids
+            records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id],context=context)[0].survey_request_ids
             for child in records:
                 if child.state == "draft" :
                     wating_id = child.id
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5784bb4d868..5d9c4e910d3 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -79,7 +79,7 @@
                  <notebook>
                    <page string="General">
                     <field name="plan_id" invisible="1"/>
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name"/>
                         <field name="wait"/>
                         <field name="sequence"/>
@@ -290,15 +290,13 @@
             <field name="arch" type="xml">
                 <form string="Interview Evaluation">
                     <group col="4" colspan="4">
-                        <field name="survey_id"  colspan="3"/>
-                        <group  colspan="1">
+                        <field name="survey_id"/>
+                        <group col="2" colspan="2">
                             <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
                                 icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                             <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
                                 icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                         </group>
-                    </group>
-                    <group col="4" colspan="4">
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
@@ -346,12 +344,17 @@
                    <group col='10' colspan='4'>
                         <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Survey" icon="terp-personal" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                </search>
             </field>
         </record>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 3769efcdfa8..2e06e47505e 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -7,11 +7,16 @@
             <field name="model">hr.evaluation.reminder</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             	<form string="Evaluation Reminders">
-			    	<field name="evaluation_id"/>
-			    	<newline/>
-			    	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-              		<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+				<form string="Evaluation Reminders">
+					<group width="340">
+					<separator string="Send evaluation reminder" colspan="4"/>
+					<field name="evaluation_id"/>
+					<separator colspan="4"/>
+						<group colspan="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+						</group>
+					</group>
              	</form>
             </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 9657b687c18..c97c5d2594d 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -84,7 +84,7 @@
                     <field name="employee_id"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 3b54631415e..f6527d5c6e8 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -81,12 +81,13 @@
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-		
+
 		<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
 		<menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-		
+
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index 7f2df2e815e..41fb3520bcc 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -59,7 +59,7 @@
                         <field name="date" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -93,7 +93,7 @@
         </record>
         <menuitem
             action="action_hr_timesheet_report_stat_all"
-            id="menu_hr_timesheet_report_all" 
+            id="menu_hr_timesheet_report_all"
             parent="menu_hr_reporting_timesheet" sequence="0"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 4c5ed013e1d..b895ace8a60 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,19 +8,21 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-	                	<field name="user_id" colspan="3" />
-                	</group>
+				<form string="Employee Timesheet">
+					<group colspan="4">
+					<separator string="This wizard will print monthly timesheet of employee" colspan="4"/>
+						<field name="month"/>
+						<field name="year"/>
+						<field name="user_id" colspan="3"/>
+					</group>
+					<separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
                    </group>
-               </form>
-            </field>
-        </record>
+                </form>
+			</field>
+		</record>
 
 		<record id="action_hr_timesheet_employee" model="ir.actions.act_window">
             <field name="name">Employee Timesheet</field>
@@ -44,13 +46,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print My Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-                	</group>
+                    <group colspan="4">
+                    <separator string="This wizard will print monthly timesheet" colspan="4"/>
+                        <field name="month"/>
+                        <field name="year"/>
+                    </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index fa1f4a80c9a..cb51fcc1cb3 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,17 +8,21 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employees Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-	                	<field name="user_ids" colspan="3" />
-                	</group>
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
-                   </group>
-               </form>
+				<form string="Employees Timesheet">
+					<group height="260" width="460">
+						<group colspan="4">
+							<separator string="This wizard will print monthly timesheet of employees" colspan="4"/>
+							<field name="month"/>
+							<field name="year"/>
+							<field name="user_ids" colspan="4"/>
+						</group>
+						<separator colspan="4"/>
+						<group colspan="4" col="6">
+							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+						</group>
+					</group>
+				</form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b56ecd75769..70104c71ef5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -116,6 +116,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
+            <field name="context">{"search_default_user_id":uid}</field>
+     <!--   <field name="search_view_id" ref="account.view_account_analytic_account_search"/> -->
         </record>
         <menuitem
             action="action_hr_analytic_timesheet_open_tree"
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 c9fed4d3e33..58215a087b7 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
@@ -490,7 +490,7 @@
             <field name="search_view_id" ref="view_random_timesheet_lines_search"/>
         </record>
          <!--Time Tracking menu in project Management-->
-         <menuitem
+<!--         <menuitem
                 icon="terp-project"
                 id="base.menu_main_pm"
                 name="Project"
@@ -504,14 +504,14 @@
                 action="action_random_timesheet_lines_board"
                 id="menu_project_management_timesheet_lines_board"
                 parent="base.menu_project_management_time_tracking"
-                sequence="7"/>
+                sequence="7"/-->
       <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
-            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
-        <menuitem
+            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
+           <menuitem
                 action="action_random_timesheet_lines_board"
                 id="menu_hr_action_random_timesheet_lines_board"
                 name="Working Hours"
                 parent="hr_attendance.menu_hr_time_tracking"
-                groups="hr.group_hr_manager" sequence="2"/>
+                groups="hr.group_hr_manager" sequence="2"/>-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 651edf9b2b1..87648a61642 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -7,19 +7,21 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Timesheet Profit">
-			    <group col="4" colspan="6">
-		    	    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <field name="journal_ids" colspan="4"/>
-				    <field name="employee_ids" colspan="4"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
-				</group>
-			</form>
+				<form string="Timesheet Profit">
+					<group height="340" width="480">
+						<group col="4" colspan="6">
+							<field name="date_from"/>
+							<field name="date_to"/>
+							<field name="journal_ids" colspan="4"/>
+							<field name="employee_ids" colspan="4"/>
+						</group>
+						<separator colspan="4"/>
+						<group col="2" colspan="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+						</group>
+					</group>
+				</form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 7ddf3bc99a7..d71b385c1f8 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,27 +8,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Invoice analytic lines">
-			    <group col="4" colspan="6">
-			        <notebook>
-			        <page string="Billing Data">
-			            <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-			            <field name="date"/>
-			            <field name="time"/>
-			            <field name="name"/>
-			            <field name="price"/>
-			            <separator string="Force to use a specific product" colspan="4"/>
-			            <field name="product"/>
-			        </page>
-			        <page string="Filter on Accounts" groups="base.group_extended">
-			            <separator string="Choose accounts you want to invoice" colspan="4"/>
-			            <field name="accounts" colspan="4" nolabel="1"/>
-			        </page>
-			        </notebook>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+			    <group height="280" width="450">
+				    <group col="4" colspan="6">
+				        <notebook>
+				        <page string="Billing Data">
+				            <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+				            <field name="date"/>
+				            <field name="time"/>
+				            <field name="name"/>
+				            <field name="price"/>
+				            <separator string="Force to use a specific product" colspan="4"/>
+				            <field name="product"/>
+				        </page>
+				        <page string="Filter on Accounts" groups="base.group_extended">
+				            <separator string="Choose accounts you want to invoice" colspan="4"/>
+				            <field name="accounts" colspan="4" nolabel="1"/>
+				        </page>
+				        </notebook>
+					</group>
+					<separator colspan="4"/>
+				    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+					</group>
 				</group>
 			</form>
             </field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 66725547aec..a8fff268b16 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -19,6 +19,7 @@
                     <field name="procure_method"/>
                     <field name="state"/>
                     <field name="message"/>
+                    <field name="name" invisible="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index a56c46bd299..c8d0d30d1de 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Compute Stock Minimum Rules Only -->
-        
+
 		<record id="view_procurement_compute_wizard" model="ir.ui.view">
             <field name="name">Compute Stock Minimum Rules Only</field>
             <field name="model">procurement.orderpoint.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
+                <label string="Wizard checks all the stock minimum rules and generate procurement order." colspan="4"/>
+				    <separator colspan="4"/>
 				    <field name="automatic"/>
 				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
@@ -22,13 +24,13 @@
             </field>
         </record>
 
-        <act_window name="Compute Stock Minimum Rules Only"		    
+        <act_window name="Compute Stock Minimum Rules Only"
 		    res_model="procurement.orderpoint.compute"
 		    src_model="procurement.order"
 		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_procurement_compute"/>        
-		
+		    target="new"
+            key2="client_action_multi"
+		    id="action_procurement_compute"/>
+
 	</data>
-</openerp>	
+</openerp>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 4af54b7409e..40c72ee68c7 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Compute Schedulers -->
-        
+
 		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
             <field name="name">Compute Schedulers</field>
             <field name="model">procurement.order.compute.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters">
+                <label string="Wizard run all the procurements, and generate task, production order or purchase order based on the product type" colspan="4"/>
+				    <separator colspan="4"/>
 				    <field name="automatic"/>
 				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
@@ -22,13 +24,13 @@
             </field>
         </record>
 
-         <act_window name="Compute Schedulers"		    
+         <act_window name="Compute Schedulers"
 		    res_model="procurement.order.compute.all"
 		    src_model="procurement.order"
 		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_compute_schedulers"/>            
-        
+		    target="new"
+            key2="client_action_multi"
+		    id="action_compute_schedulers"/>
+
 	</data>
-</openerp>	
+</openerp>
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index edad2ac1add..db2eb1073d9 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
-			Survey Question Wizard 
+			Survey Question Wizard
 		 -->
-		 
+
 		<record id="view_survey_question_message" model="ir.ui.view">
 			<field name="name">Survey Question</field>
 			<field name="model">survey.question.wiz</field>
@@ -28,8 +28,7 @@
 			</field>
 		</record>
 
-		<record id="action_view_survey_question_message"
-			model="ir.actions.act_window">
+		<record id="action_view_survey_question_message" model="ir.actions.act_window">
 			<field name="name">Survey Question</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">survey.question.wiz</field>
@@ -38,6 +37,6 @@
 			<field name="target">new</field>
 		</record>
 
-		
+
 	</data>
 </openerp>
\ No newline at end of file