Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_invoice-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_invoice-topbar-tpa/+merge/103657
hr_timesheet_invoice
==========================================
[IMP]: Move state and button in a top bar.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_timesheet_invoice-topbar-tpa/+merge/103657
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa.
=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml 2012-04-25 13:40:18 +0000
+++ account/project/project_view.xml 2012-04-26 10:36:31 +0000
@@ -80,7 +80,10 @@
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Analytic account">
+ <form layout="manual">
+ <div class="oe_form_topbar">
+ </div>
+ <sheet string="Analytic account" layout="auto">
<group colspan="4" col="6">
<field name="name" colspan="4"/>
<field name="code"/>
@@ -106,6 +109,7 @@
<field colspan="4" name="description" nolabel="1"/>
</page>
</notebook>
+ </sheet>
</form>
</field>
</record>
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-04-03 08:27:56 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-04-26 10:36:31 +0000
@@ -21,16 +21,17 @@
<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"/>
- <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>
+ <xpath expr="/form/div" position='inside'>
+ <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+ <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+ <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+ <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>
+ </xpath>
</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
