diff options
| author | François Degrave <fde@openerp.com> | 2010-12-30 13:24:28 +0100 |
|---|---|---|
| committer | François Degrave <fde@openerp.com> | 2010-12-30 13:24:28 +0100 |
| commit | a8a2183a77ea7a8731ee7653cdb2302ce2de72f4 (patch) | |
| tree | deb4c479ec49b6696ae98eb2ee5bf68fb5d1eebe /addons/hr_expense | |
| parent | fa871f325c57a9069fc7d3b70d081c8ef7440562 (diff) | |
[IMP] HR access rights
bzr revid: fde@openerp.com-20101230122428-wqsf7qcck7rasbfp
Diffstat (limited to 'addons/hr_expense')
| -rw-r--r-- | addons/hr_expense/hr_expense_view.xml | 18 | ||||
| -rw-r--r-- | addons/hr_expense/hr_expense_workflow.xml | 8 | ||||
| -rw-r--r-- | addons/hr_expense/security/ir.model.access.csv | 1 |
3 files changed, 18 insertions, 9 deletions
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 17e0dd09bf9..b3c4eb94b93 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -35,8 +35,8 @@ <field name="name"/> <field name="amount"/> <field name="state"/> - <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/> - <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/> + <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/> + <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager,base.group_hr_user"/> </tree> </field> </record> @@ -54,8 +54,8 @@ <field name="name"/> <field name="amount"/> <field name="state"/> - <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/> - <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/> + <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/> + <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager,base.group_hr_user"/> </tree> </field> </record> @@ -101,11 +101,11 @@ </field> <field name="state"/> <group col="6" colspan="2"> - <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_manager"/> - <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" /> - <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/> - <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager"/> - <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager"/> + <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_manager,base.group_hr_user"/> + <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager,base.group_hr_user" /> + <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/> + <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager,base.group_hr_user"/> + <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager,base.group_hr_user"/> </group> </page> <page string="Other Info" groups="base.group_extended"> diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml index 192533e67de..7946bef3b6b 100644 --- a/addons/hr_expense/hr_expense_workflow.xml +++ b/addons/hr_expense/hr_expense_workflow.xml @@ -65,48 +65,56 @@ <field name="act_from" ref="act_confirm"/> <field name="act_to" ref="act_accepted"/> <field name="signal">validate</field> + <field name="group_id" ref="base.group_hr_user"/> </record> <record id="t4" model="workflow.transition"> <field name="act_from" ref="act_confirm"/> <field name="act_to" ref="act_refused"/> <field name="signal">refuse</field> + <field name="group_id" ref="base.group_hr_user"/> </record> <record id="t6" model="workflow.transition"> <field name="act_from" ref="act_accepted"/> <field name="act_to" ref="act_refused"/> <field name="signal">refuse</field> + <field name="group_id" ref="base.group_hr_user"/> </record> <record id="t7" model="workflow.transition"> <field name="act_from" ref="act_confirm"/> <field name="act_to" ref="act_draft"/> <field name="signal">draft</field> + <field name="group_id" ref="base.group_hr_user"/> </record> <record id="t8" model="workflow.transition"> <field name="act_from" ref="act_accepted"/> <field name="act_to" ref="act_invoice"/> <field name="signal">invoice</field> + <field name="group_id" ref="base.group_hr_user"/> </record> <record id="t9" model="workflow.transition"> <field name="act_from" ref="act_invoice"/> <field name="act_to" ref="act_paid"/> <field name="signal">subflow.paid</field> + <field name="group_id" ref="base.group_hr_user"/> </record> <record id="t10" model="workflow.transition"> <field name="act_from" ref="act_invoice"/> <field name="act_to" ref="act_refused"/> <field name="signal">subflow.cancel</field> + <field name="group_id" ref="base.group_hr_user"/> </record> <record id="t11" model="workflow.transition"> <field name="act_from" ref="act_refused"/> <field name="act_to" ref="act_draft"/> <field name="signal">draft</field> + <field name="group_id" ref="base.group_hr_user"/> </record> </data> diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv index fa8b5401497..674b06304d2 100644 --- a/addons/hr_expense/security/ir.model.access.csv +++ b/addons/hr_expense/security/ir.model.access.csv @@ -2,6 +2,7 @@ "access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1 "access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,1,1,1 "access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1 +"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,1,1,1 "access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1 "access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1 "access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1 |
