[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20110216124125-7orp1hxq6clpshmb
This commit is contained in:
ARA (OpenERP)
2011-02-16 18:11:25 +05:30
4 changed files with 22 additions and 2 deletions
+8
View File
@@ -9,5 +9,13 @@
<record id="base.group_hr_user" model="res.groups">
<field name="name">Human Resources / User</field>
</record>
<record id="property_rule_employee" model="ir.rule">
<field name="name">Employee</field>
<field model="ir.model" name="model_id" ref="model_hr_employee"/>
<field name="domain_force">[('user_id','=',user.id)]</field>
<field name="groups" eval="[(4,ref('base.group_user'))]"/>
</record>
</data>
</openerp>
+7 -1
View File
@@ -1624,6 +1624,12 @@ Once the form had been filled, the employee send it to his supervisor.
<field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
<field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
</record>
</data>
<record id="property_rule_employee_evaluation" model="ir.rule">
<field name="name">Employee Evaluation</field>
<field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
<field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
<field name="groups" eval="[(4,ref('base.group_user'))]"/>
</record>
</data>
</openerp>
+1 -1
View File
@@ -5,7 +5,7 @@
<record id="property_rule_expense" 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="domain_force">['|', ('employee_id.user_id','=',user.id), ('department_id.manager_id.user_id','=',user.id)]</field>
<field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
</record>
<record id="property_rule_expense_manager" model="ir.rule">
@@ -5,6 +5,12 @@
<!-- <record id="group_hr_payroll" model="res.groups">-->
<!-- <field name="name">Human Resources / Payroll</field>-->
<!-- </record>-->
<record id="property_rule_employee_payroll" model="ir.rule">
<field name="name">Employee Payroll</field>
<field model="ir.model" name="model_id" ref="model_hr_payslip"/>
<field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
<field name="groups" eval="[(4,ref('base.group_user'))]"/>
</record>
</data>
</openerp>