diff options
| -rw-r--r-- | addons/account/project/project_view.xml | 4 | ||||
| -rw-r--r-- | addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 648af6dda4c..ee8ea3dbf87 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -80,7 +80,8 @@ <field name="model">account.analytic.account</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Analytic account"> + <form layout="manual"> + <sheet string="Analytic account" layout="auto"> <group colspan="4" col="6"> <field name="name" colspan="4"/> <field name="code"/> @@ -106,6 +107,7 @@ <field colspan="4" name="description" nolabel="1"/> </page> </notebook> + </sheet> </form> </field> </record> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 2f5c8d24d79..12b782f239c 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -21,16 +21,19 @@ <separator colspan="4" string="Invoicing Statistics"/> <field name="amount_invoiced"/> </group> - <separator colspan="4"/> - <group col="9" colspan="8"> - <field name="state" readonly="1" widget="statusbar" - statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/> - <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/> + </group> + <xpath expr="/form/sheet" position='before'> + <div class="oe_form_topbar"> + <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/> <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/> <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/> - <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/> - </group> - </group> + <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/> + <div class="oe_right"> + <field name="state" readonly="1" widget="statusbar" nolabel="1" + statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/> + </div> + </div> + </xpath> </field> </record> |