Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-Procurement-mma
into lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-Procurement-mma/+merge/104715
Hello Sir,
procurement : I have add state and buttons on top bar and sheet tag in
inherited view
Thanks
mma
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-Procurement-mma/+merge/104715
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-Procurement-mma
into lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa.
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-04-26 08:44:00 +0000
+++ mrp/mrp_view.xml 2012-05-04 10:47:47 +0000
@@ -967,10 +967,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<data>
- <xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+ <xpath expr="/form/sheet/notebook/page/field[@name='move_id']" position="before">
<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
</xpath>
- <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+ <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
<group colspan="4" groups="product.group_mrp_properties">
<separator colspan="4" string="Properties" />
<field colspan="4" name="property_ids" nolabel="1"/>
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2012-04-25 14:18:36 +0000
+++ procurement/procurement_view.xml 2012-05-04 10:47:47 +0000
@@ -46,8 +46,18 @@
<field name="model">procurement.order</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Procurement">
- <group col="2" colspan="2">
+ <form layout="manual">
+ <div class="oe_form_topbar">
+ <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
+ <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
+ <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
+ <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+ <div class="oe_right">
+ <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
+ </div>
+ </div>
+ <sheet string="Procurement" layout="auto">
+ <group col="2" colspan="2" class="oe_form_header">
<separator colspan="2" string="References"/>
<field name="name" string="Procurement Reason"/>
<field name="origin"/>
@@ -72,13 +82,6 @@
<separator colspan="4" string="Status"/>
<field colspan="4" name="message" readonly="1"/>
- <field name="state" readonly="1"/>
- <group col="7" colspan="2">
- <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
- <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
- <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
- <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
- </group>
</page>
<page string="Extra Information">
<separator colspan="4" string="Details"/>
@@ -91,6 +94,7 @@
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
+ </sheet>
</form>
</field>
</record>
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-04-26 08:42:45 +0000
+++ purchase/purchase_view.xml 2012-05-04 10:47:47 +0000
@@ -512,7 +512,7 @@
<field name="inherit_id" ref="procurement.procurement_form_view"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
+ <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="before">
<field name="purchase_id"/>
</xpath>
</field>
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml 2012-04-26 09:02:23 +0000
+++ purchase_requisition/purchase_requisition_view.xml 2012-05-04 10:47:47 +0000
@@ -200,7 +200,7 @@
<field name="model">procurement.order</field>
<field name="inherit_id" ref="procurement.procurement_form_view"/>
<field name="arch" type="xml">
- <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+ <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
<field name="requisition_id"/>
</xpath>
</field>
_______________________________________________
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