Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_sheet-topbar-tpa into
lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_timesheet_sheet-topbar-tpa/+merge/103606
hr_timesheet_sheet
==========================================
[IMP]: Move state and button in a top bar.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_timesheet_sheet-topbar-tpa/+merge/103606
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa.
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-04-25 14:11:35 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-04-26 05:52:21 +0000
@@ -60,8 +60,18 @@
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Timesheet">
- <group colspan="4" col="6">
+ <form layout="manual">
+ <div class="oe_form_topbar">
+ <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
+ <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
+ <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+ <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+ <div class="oe_right">
+ <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
+ </div>
+ </div>
+ <sheet string="Timesheet" layout="auto">
+ <group colspan="4" col="6" class="oe_form_header">
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="user_id" invisible="1"/>
<field name="date_from"/>
@@ -142,13 +152,7 @@
</group>
</page>
</notebook>
- <group col="6" colspan="4">
- <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
- <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
- <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
- <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
- <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
- </group>
+ </sheet>
</form>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
