From 713dff9dbaf562e8955b94b45b0a1681199ec7fd Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 21 Sep 2012 12:38:09 +0530
Subject: [PATCH 1/8] [IMP]group attendance to restrict attendance related
 fields and views

bzr revid: pna@tinyerp.com-20120921070809-x62vwxdyhw7pyciw
---
 addons/hr_attendance/__openerp__.py              |  3 +--
 addons/hr_attendance/hr_attendance_view.xml      | 13 ++++++-------
 addons/hr_attendance/security/ir_rule.xml        |  6 ++++++
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py  |  2 +-
 .../hr_timesheet_sheet_data.xml                  |  2 +-
 .../hr_timesheet_sheet_view.xml                  | 16 ++++++++--------
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index cb2cd261773..c125174fed1 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -35,11 +35,10 @@ actions(Sign in/Sign out) performed by them.
     'images': ['images/hr_attendances.jpeg'],
     'depends': ['hr'],
     'data': [
+        'security/ir_rule.xml',
         'security/ir.model.access.csv',
         'hr_attendance_view.xml',
         'hr_attendance_report.xml',
-        'security/ir.model.access.csv',
-        'security/ir_rule.xml',
         'wizard/hr_attendance_bymonth_view.xml',
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c686b4c1ff0..569d98775fd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -76,9 +76,9 @@
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="5" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_user,base.group_hr_manager,base.group_hr_attendance"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20" groups="base.group_hr_attendance"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -114,9 +114,8 @@
         </record>
 
         <menuitem
-            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
-            groups="base.group_no_one"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_no_one"/>
+            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" groups="base.group_hr_attendance" name="Attendance"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_hr_attendance"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
@@ -124,8 +123,8 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-                    <label for="state"/>
-                    <div>
+                    <label for="state" groups="base.group_hr_attendance"/>
+                    <div groups="base.group_hr_attendance">
                         <field name="state" class="oe_inline"/> - 
                         <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
                         <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index b934dc16f5a..6b8a7603f83 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -2,6 +2,12 @@
 <openerp>
     <data noupdate="True">
 
+        <record id="base.group_hr_attendance" model="res.groups">
+            <field name="name">Attendance</field>
+            <field name="category_id" ref="base.module_category_human_resources"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index fcdbfda0667..f744e61c4d7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -333,7 +333,7 @@ class hr_timesheet_sheet(osv.osv):
                 'draft': [('readonly', False)],
                 'new': [('readonly', False)]}
             ),
-        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'),
+        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances',groups="base.group_attendance"),
         'state' : fields.selection([
             ('new', 'New'),
             ('draft','Open'),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 87edf949972..c3bab3b4ad1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -20,7 +20,7 @@
             <field name="name">My Timesheet</field>
         </record>
 
-        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
+        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" groups="base.group_hr_attendance" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6c92e28564e..c99b731af05 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -64,7 +64,7 @@
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                         <group>
-                            <field name="total_attendance" widget="float_time"/>
+                            <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                             <field name="total_timesheet" widget="float_time"/>
                             <field name="total_difference" widget="float_time"/>
                             <field name="user_id" invisible="1"/>
@@ -92,14 +92,14 @@
                                     </tree>
                                 </field>
                                 <group>
-                                    <div align="right" groups="base.group_hr_manager">
-                                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In"/>
-                                        <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out"/>
+                                    <div align="right" groups="base.group_hr_manager,base.group_hr_attendance">
+                                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" groups= "base.group_hr_attendance"/>
+                                        <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" groups= "base.group_hr_attendance"/>
                                     </div>
                                 </group>
                             </group>
                             <group col="4">
-                                <field name="state_attendance"/>
+                                <field name="state_attendance" groups="base.group_hr_attendance"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
@@ -134,7 +134,7 @@
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time"/>
+                                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                                     <field name="total_timesheet" widget="float_time"/>
                                     <field name="total_difference" widget="float_time"/>
                                 </tree>
@@ -318,7 +318,7 @@
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="department_id"/>
-                    <field name="total_attendance" widget="float_time"/>
+                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time"/>
                     <field name="total_difference" widget="float_time"/>
                     <field name="state"/>
@@ -332,7 +332,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:total_difference&lt;0.1;red:total_difference&gt;=0.1" string="Period">
                     <field name="name"/>
-                    <field name="total_attendance" widget="float_time" sum="Total Attendances"/>
+                    <field name="total_attendance" widget="float_time" sum="Total Attendances" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time" sum="Total Timesheet"/>
                     <field name="total_difference" widget="float_time" sum="Total Difference"/>
                 </tree>

From 008d5d35d7b944c54bc7e8f16bbe8c5a2966f2be Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 21 Sep 2012 19:14:05 +0530
Subject: [PATCH 2/8] [IMP]add config file in hr_attendance

bzr revid: pna@tinyerp.com-20120921134405-0q3mwq6dsp2fw4yu
---
 addons/hr_attendance/__init__.py              |  1 +
 addons/hr_attendance/__openerp__.py           |  1 +
 addons/hr_attendance/hr_attendance.py         | 11 +++++++
 addons/hr_attendance/res_config.py            | 33 +++++++++++++++++++
 addons/hr_attendance/res_config_view.xml      | 20 +++++++++++
 .../hr_attendance/static/src/js/attendance.js |  7 ++--
 6 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 addons/hr_attendance/res_config.py
 create mode 100644 addons/hr_attendance/res_config_view.xml

diff --git a/addons/hr_attendance/__init__.py b/addons/hr_attendance/__init__.py
index dadb043e016..feb32e22792 100644
--- a/addons/hr_attendance/__init__.py
+++ b/addons/hr_attendance/__init__.py
@@ -22,5 +22,6 @@
 import hr_attendance
 import wizard
 import report
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index c125174fed1..29ee6869241 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -42,6 +42,7 @@ actions(Sign in/Sign out) performed by them.
         'wizard/hr_attendance_bymonth_view.xml',
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
+        'res_config_view.xml',
     ],
     'demo': ['hr_attendance_demo.xml'],
     'test': [
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 8fdd2928fe6..3a704e8f466 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -126,9 +126,20 @@ class hr_employee(osv.osv):
                 result[id] = res[0]
         return result
 
+    def _attendance_access(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        data_obj = self.pool.get('ir.model.data')
+        group = data_obj.get_object(cr, uid,'hr_attendance', 'hr_attendace_group')
+        if uid in [user.id for user in group.user]:
+            res[ids] = True
+        else:
+            res[ids] = False
+        return res
+
     _columns = {
        'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
        'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'),
+       'attendance_access': fields.function(_attendance_access, type='boolean', string="Access or not"),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py
new file mode 100644
index 00000000000..02eeb4c0d21
--- /dev/null
+++ b/addons/hr_attendance/res_config.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class hr_attendance_config_settings(osv.osv_memory):
+    _inherit = 'hr.config.settings'
+
+    _columns = {
+        'group_hr_attendance': fields.boolean('Allow to show Attendance details.',
+            implied_group='base.group_hr_attendance',
+            help="To allow to show Attendance details."),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/res_config_view.xml b/addons/hr_attendance/res_config_view.xml
new file mode 100644
index 00000000000..5ab8ea82af9
--- /dev/null
+++ b/addons/hr_attendance/res_config_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="hr_attendace_group" model="ir.ui.view">
+            <field name="name">hr.config.settings.inherit</field>
+            <field name="model">hr.config.settings</field>
+            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//div[@name='hr_timesheet']" position="after">
+                    <div>
+                        <field name="group_hr_attendance" class="oe_inline"/>
+                        <label for="group_hr_attendance"/>
+                    </div>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 1b5e271b4ba..0068b495628 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -57,9 +57,12 @@ openerp.hr_attendance = function (instance) {
             var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [
                 ['user_id', '=', self.session.uid]
             ]);
-            return employee.read_slice(['id', 'name', 'state', 'last_sign']).pipe(function (res) {
-                if (_.isEmpty(res))
+            return employee.read_slice(['id', 'name', 'state', 'last_sign', 'attendance_access']).pipe(function (res) {
+                if (_.isEmpty(res) )
                     return;
+                if (res['attendance_access'] == false){
+                    return;
+                }
                 self.$el.show();
                 self.employee = res[0];
                 self.last_sign = instance.web.str_to_datetime(self.employee.last_sign);

From 4d9fa191228a9aa917106899f7fbc2fcf99b53a8 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 24 Sep 2012 10:47:24 +0530
Subject: [PATCH 3/8] [IMP]sign in or sign out button enable if attendance
 group

bzr revid: pna@tinyerp.com-20120924051724-m5b74g2kfw8c337h
---
 addons/hr_attendance/hr_attendance.py            | 11 ++++++-----
 addons/hr_attendance/static/src/js/attendance.js |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 3a704e8f466..626fd45ba42 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -129,11 +129,12 @@ class hr_employee(osv.osv):
     def _attendance_access(self, cr, uid, ids, name, args, context=None):
         res = {}
         data_obj = self.pool.get('ir.model.data')
-        group = data_obj.get_object(cr, uid,'hr_attendance', 'hr_attendace_group')
-        if uid in [user.id for user in group.user]:
-            res[ids] = True
-        else:
-            res[ids] = False
+        group = data_obj.get_object(cr, uid, 'base', 'group_hr_attendance')
+        for id in ids :
+            if uid in [user.id for user in group.users]:
+                res[id] = True
+            else:
+                res[id] = False
         return res
 
     _columns = {
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 0068b495628..d92e7534786 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -60,7 +60,7 @@ openerp.hr_attendance = function (instance) {
             return employee.read_slice(['id', 'name', 'state', 'last_sign', 'attendance_access']).pipe(function (res) {
                 if (_.isEmpty(res) )
                     return;
-                if (res['attendance_access'] == false){
+                if (res[0].attendance_access == false){
                     return;
                 }
                 self.$el.show();

From 2deb110a238bbd8a0a6c41f58f15dc1f693b4fe1 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 24 Sep 2012 12:09:51 +0530
Subject: [PATCH 4/8] [IMP] hr_attendance: refactor code

bzr revid: hmo@tinyerp.com-20120924063951-ub602rou1p9wtt7p
---
 addons/hr_attendance/hr_attendance.py           | 17 +++++++----------
 .../hr_timesheet_sheet_data.xml                 |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 626fd45ba42..a2ee3650a2f 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -127,20 +127,17 @@ class hr_employee(osv.osv):
         return result
 
     def _attendance_access(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        data_obj = self.pool.get('ir.model.data')
-        group = data_obj.get_object(cr, uid, 'base', 'group_hr_attendance')
-        for id in ids :
-            if uid in [user.id for user in group.users]:
-                res[id] = True
-            else:
-                res[id] = False
-        return res
+        # this function field use to hide attendance button to singin/singout from menu
+        group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_hr_attendance')
+        visible = False
+        if uid in [user.id for user in group.users]:
+            visible = True
+        return dict([(x, visible) for x in ids])
 
     _columns = {
        'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
        'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'),
-       'attendance_access': fields.function(_attendance_access, type='boolean', string="Access or not"),
+       'attendance_access': fields.function(_attendance_access, type='boolean'),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index c3bab3b4ad1..87edf949972 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -20,7 +20,7 @@
             <field name="name">My Timesheet</field>
         </record>
 
-        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" groups="base.group_hr_attendance" sequence="1"/>
+        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
 
     </data>
 </openerp>

From 4550c4ced899cdd8f19c128b6ae441a4899765eb Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 24 Sep 2012 13:49:34 +0530
Subject: [PATCH 5/8] [IMP]attendance related fields and menu hide

bzr revid: pna@tinyerp.com-20120924081934-2e2bj1fa4pstrg91
---
 addons/hr/res_config_view.xml                         |  2 +-
 addons/hr_attendance/res_config_view.xml              |  2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py       |  2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml |  2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 10 +++++-----
 addons/project_timesheet/project_timesheet_view.xml   |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 7507665c96d..f370b26139d 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -69,7 +69,7 @@
                                 <field name="module_hr_timesheet_sheet" class="oe_inline"/>
                                 <label for="module_hr_timesheet_sheet"/>
                             </div>
-                            <div>
+                            <div name="hr_attendance">
                                 <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
                                 <label for="module_hr_attendance"/>
                             </div>
diff --git a/addons/hr_attendance/res_config_view.xml b/addons/hr_attendance/res_config_view.xml
index 5ab8ea82af9..252672ad86d 100644
--- a/addons/hr_attendance/res_config_view.xml
+++ b/addons/hr_attendance/res_config_view.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="//div[@name='hr_timesheet']" position="after">
+                 <xpath expr="//div[@name='hr_attendance']" position="after">
                     <div>
                         <field name="group_hr_attendance" class="oe_inline"/>
                         <label for="group_hr_attendance"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index f744e61c4d7..fcdbfda0667 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -333,7 +333,7 @@ class hr_timesheet_sheet(osv.osv):
                 'draft': [('readonly', False)],
                 'new': [('readonly', False)]}
             ),
-        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances',groups="base.group_attendance"),
+        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'),
         'state' : fields.selection([
             ('new', 'New'),
             ('draft','Open'),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index c3bab3b4ad1..87edf949972 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -20,7 +20,7 @@
             <field name="name">My Timesheet</field>
         </record>
 
-        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" groups="base.group_hr_attendance" sequence="1"/>
+        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c99b731af05..15d1cd6344b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -66,7 +66,7 @@
                         <group>
                             <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                             <field name="total_timesheet" widget="float_time"/>
-                            <field name="total_difference" widget="float_time"/>
+                            <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
                             <field name="user_id" invisible="1"/>
                         </group>
                     </group>
@@ -84,7 +84,7 @@
                                 </div>
                             </group>
                             <group colspan="4" col="3">
-                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
+                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance">
                                     <tree string="Attendances" editable="bottom">
                                         <field name="name"/>
                                         <field name="action"/>
@@ -136,7 +136,7 @@
                                     <field name="name"/>
                                     <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                                     <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time"/>
+                                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
                                 </tree>
                             </field>
                         </page>
@@ -320,7 +320,7 @@
                     <field name="department_id"/>
                     <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time"/>
-                    <field name="total_difference" widget="float_time"/>
+                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -334,7 +334,7 @@
                     <field name="name"/>
                     <field name="total_attendance" widget="float_time" sum="Total Attendances" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time" sum="Total Timesheet"/>
-                    <field name="total_difference" widget="float_time" sum="Total Difference"/>
+                    <field name="total_difference" widget="float_time" sum="Total Difference" groups="base.group_hr_attendance"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 66104ee0d8c..c7d6ab15ab4 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -97,7 +97,7 @@
         <menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
             id="menu_hr_timesheet_sign_in"
             parent="hr_attendance.menu_hr_attendance"
-            sequence="5" />
+            sequence="5" groups="base.group_hr_attendance" />
 
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>

From fb05869829fb1e0ae1e59aedd9d43648ba8e2941 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 24 Sep 2012 15:50:02 +0530
Subject: [PATCH 6/8] [IMP]improve help

bzr revid: pna@tinyerp.com-20120924102002-5ege35d024t2br6h
---
 addons/hr_attendance/res_config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py
index 02eeb4c0d21..4cbbe8dd405 100644
--- a/addons/hr_attendance/res_config.py
+++ b/addons/hr_attendance/res_config.py
@@ -25,9 +25,9 @@ class hr_attendance_config_settings(osv.osv_memory):
     _inherit = 'hr.config.settings'
 
     _columns = {
-        'group_hr_attendance': fields.boolean('Allow to show Attendance details.',
+        'group_hr_attendance': fields.boolean('Show menus related to attendance',
             implied_group='base.group_hr_attendance',
-            help="To allow to show Attendance details."),
+            help="Allocates attendance group to all users."),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ac1f14ed6e718574dce4d317f77e57453f157622 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 26 Sep 2012 10:46:36 +0530
Subject: [PATCH 7/8] [IMP]make cancel button oe_left so not change the
 sequence of button

bzr revid: pna@tinyerp.com-20120926051636-q0pytbzu2b9lq18r
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 29d68d7a12c..103dbed4497 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -266,7 +266,7 @@
                 <form string="Interview Appraisal" version="7.0">
                     <header>
                         <button string="Cancel" name="survey_req_cancel" type="object"
-                            states="draft,waiting_answer"/>
+                            states="draft,waiting_answer" class="oe_left"/>
                         <button string="Print Survey" name="action_print_survey"  type="object"
                             states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
                             attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>

From 4ff0940d3e7d65fe6e79487d7ecd13bb7d939f5e Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 26 Sep 2012 12:19:30 +0530
Subject: [PATCH 8/8] [IMP]remove span from header to avoid button position

bzr revid: pna@tinyerp.com-20120926064930-3xmuklr1ky0ngrfn
---
 addons/hr/hr_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5d4c2ae9d45..6e23a714848 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -350,10 +350,8 @@
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_highlight"/>
-                            <button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_highlight"/>
-                        </span>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_highlight" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>