Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-purchase-topbar-kjo 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-purchase-topbar-kjo/+merge/103631
Add the state in topbar
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-purchase-topbar-kjo/+merge/103631
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa.
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-04-25 13:22:02 +0000
+++ purchase/purchase_view.xml 2012-04-26 08:47:21 +0000
@@ -130,7 +130,22 @@
<field name="model">purchase.order</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Purchase Order">
+ <form layout="manual">
+ <div class="oe_form_topbar">
+ <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+ <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
+ <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
+ <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
+ <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
+ <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
+ <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+ <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
+ <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+ <div class="oe_right">
+ <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
+ </div>
+ </div>
+ <sheet string="Purchase Order" layout="auto">
<group col="6" colspan="4">
<field name="name"/>
<field name="date_order"/>
@@ -164,18 +179,6 @@
<field name="amount_total" sum="Total amount"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
</group>
- <group col="11" colspan="4">
- <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
- <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
- <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
- <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
- <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
- <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
- <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
- <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
- <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
- <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
- </group>
</page>
<page string="Delivery & Invoicing">
<group colspan="2" col="2">
@@ -203,7 +206,10 @@
<field colspan="4" name="notes" nolabel="1"/>
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</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
