openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895
  #694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
  https://bugs.launchpad.net/bugs/694144
  #695632 [RC1]Two same fields creating problem in web-client
  https://bugs.launchpad.net/bugs/695632
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #702805 an employee shouldn't be able to see expenses and holidays of others employee
  https://bugs.launchpad.net/bugs/702805

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/46449

[FIX] hr_attendance,hr_expense,hr_holidays: added 'ir.rule' for group 'Employee'" --fixes lp:702805 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/46449
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_attendance/security/ir_rule.xml'
--- hr_attendance/security/ir_rule.xml	2011-01-14 00:11:01 +0000
+++ hr_attendance/security/ir_rule.xml	2011-01-17 09:11:23 +0000
@@ -14,6 +14,12 @@
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
         </record>
+        <record id="property_rule_attendace_employee" model="ir.rule">
+            <field name="name">Employee Attendance</field>
+            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        </record>
 
 
     </data>

=== modified file 'hr_expense/security/ir_rule.xml'
--- hr_expense/security/ir_rule.xml	2011-01-14 00:11:01 +0000
+++ hr_expense/security/ir_rule.xml	2011-01-17 09:11:23 +0000
@@ -14,6 +14,12 @@
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
         </record>
+        <record id="property_rule_expense_employee" model="ir.rule">
+            <field name="name">Employee Expense</field>
+            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        </record>
 
     </data>
 </openerp>

=== modified file 'hr_holidays/security/ir_rule.xml'
--- hr_holidays/security/ir_rule.xml	2011-01-14 00:11:01 +0000
+++ hr_holidays/security/ir_rule.xml	2011-01-17 09:11:23 +0000
@@ -14,6 +14,12 @@
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(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"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
 
   </data>
 </openerp>

=== modified file 'hr_timesheet/report/user_timesheet.py'
--- hr_timesheet/report/user_timesheet.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet/report/user_timesheet.py	2011-01-17 09:11:23 +0000
@@ -49,6 +49,7 @@
         emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
         user_id = emp_obj.browse(cr, uid, emp_id).user_id.id
         empl_name = emp_obj.browse(cr, uid, emp_id).name
+
  
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)

=== modified file 'hr_timesheet/report/users_timesheet.py'
--- hr_timesheet/report/users_timesheet.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet/report/users_timesheet.py	2011-01-17 09:11:23 +0000
@@ -91,6 +91,7 @@
         for id in data['form']['employee_ids']:
             user = emp_obj.browse(cr, uid, id).user_id.id
             empl_name = emp_obj.browse(cr, uid, id).name
+
             if user:
                 emp_xml += emp_create_xml(cr, user, som, eom, empl_name)
         # Computing the xml