pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_expance-topbar-tpa

Browse Source 
bzr revid: apa@tinyerp.com-20120426095150-07e8eiteba2u4p5n
This commit is contained in:
Amit Patel (OpenERP)
2012-04-26 15:21:50 +05:30
parent 71ebe9285c b22f46a8f9
commit 76dc477753
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/hr_expense_view.xml
+13 -9
View File
@@ -65,7 +65,18 @@
<field name="type">form</field>
<field name="model">hr.expense.expense</field>
<field name="arch" type="xml">
<form string="Expenses Sheet">
<form layout="manual">
<div class="oe_form_topbar">
<button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
<button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
<button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
<div class="oe_right">
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</div>
</div>
<sheet string="Expenses Sheet" layout="auto">
<group colspan="4" col="6">
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="name"/>
@@ -99,14 +110,6 @@
</group>
</form>
</field>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
<group col="6" colspan="2">
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
<button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
<button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
<button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
</group>
</page>
<page string="Other Info">
<group col="2" colspan="2">
@@ -124,6 +127,7 @@
<field colspan="4" name="note" nolabel="1"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>