Merge lp:~openerp-commiter/openobject-addons/trunk-leave-req-imp-dbr-hr_leave-pna into lp:~openerp-dev/openobject-addons/trunk-leave-req-imp-dbr

[Pinakin Nayi (OpenERP)]

Hello ,

  I improved hr_holiday access rules for hr Manager,hr officer and employee.

Thanks,
pna

[lp:~openerp-commiter/openobject-addons/trunk-leave-req-imp-dbr-hr_leave-pna]

7006. By Pinakin Nayi (OpenERP) on 2012-07-20

[IMP]hr_leave_security

Unmerged revisions

7006. By Pinakin Nayi (OpenERP) on 2012-07-20

[IMP]hr_leave_security

7005. By Pinakin Nayi (OpenERP) on 2012-07-18

[IMP]hr_holidays-leave

7004. By DBR (OpenERP) on 2012-07-11

[IMP]hr_holiday: Improve constraints message

7003. By DBR (OpenERP) on 2012-07-11

[IMP]hr_holiday: Remove extra messages and methods

7002. By DBR (OpenERP) on 2012-07-11

[Merge]with: lp:openobject-addons

7001. By DBR (OpenERP) on 2012-07-10

[IMP]hr_holiday: Set ir_rules for employee

7000. By DBR (OpenERP) on 2012-07-10

[IMP]hr_holiday: set name required for history
remove submit to manager button from allocation view
Improve onchange name

6999. By DBR (OpenERP) on 2012-07-10

[IMP]Improve on_change name

6998. By DBR (OpenERP) on 2012-07-09

[Merge]with : lp:openobject-addons

6997. By DBR (OpenERP) on 2012-07-09

[IMP] add placeholder and lit demo file changes

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2012-07-20 05:46:06 +0000
+++ hr_holidays/hr_holidays.py	2012-07-20 06:31:30 +0000
@@ -22,6 +22,7 @@
 ##############################################################################
 
 import datetime, time
+import math
 from itertools import groupby
 from operator import itemgetter
 
@@ -112,7 +113,7 @@
         return result
 
     _columns = {
-        'name': fields.text('Description', required=True,states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'name': fields.text('Description',states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -208,7 +209,7 @@
         if date_to and date_from:
             diff_day = self._get_number_of_days(date_from, date_to)
             result['value'] = {
-                'number_of_days_temp': round(diff_day)+1
+                'number_of_days_temp': math.floor(diff_day)+1
             }
             return result
         result['value'] = {
@@ -288,7 +289,6 @@
                         'holiday_status_id': record.holiday_status_id.id,
                         'date_from': record.date_from,
                         'date_to': record.date_to,
-                        'notes': record.notes,
                         'number_of_days_temp': record.number_of_days_temp,
                         'parent_id': record.id,
                         'employee_id': emp.id
 
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2012-07-20 05:46:06 +0000
+++ hr_holidays/hr_holidays_view.xml	2012-07-20 06:31:30 +0000
@@ -179,9 +179,8 @@
                     </group>
                     <group>
                         <field name="double_validation" invisible="1"/>
-                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                     </group>
-                    <field name="name" placeholder="Add a reason..."/>
+                    <field name="name" required="True" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -295,7 +294,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_my_leaves': 1}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type.</field>
 
=== modified file 'hr_holidays/security/ir.model.access.csv'
--- hr_holidays/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ hr_holidays/security/ir.model.access.csv	2012-07-20 06:31:30 +0000
@@ -4,4 +4,4 @@
 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
-access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_manager,1,1,1,1
+access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
 
=== modified file 'hr_holidays/security/ir_rule.xml'
--- hr_holidays/security/ir_rule.xml	2012-07-10 13:31:27 +0000
+++ hr_holidays/security/ir_rule.xml	2012-07-20 06:31:30 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
   <data>
+    <record id="property_rule_holidays" model="ir.rule">
+        <field name="name">Employee Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_user')]),(6,0,[ref('base.group_hr_manager')])]"/>
+    </record>
+
     <record id="property_rule_holidays_employee" model="ir.rule">
         <field name="name">Employee Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>