odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-Procurement-mma 

bzr revid: apa@tinyerp.com-20120504110305-g56q5x1mvqmdqgme
This commit is contained in:
Amit Patel (OpenERP) 2012-05-04 16:33:05 +05:30
parent 2997e058c1 1de84a98bc
commit 225eb4f1c8
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mrp/mrp_view.xml
View File

@ -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"/>

2
addons/procurement/procurement.py
View File

@ -106,10 +106,10 @@ class procurement_order(osv.osv):
'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
'state': fields.selection([
('draft','Draft'),
('cancel','Cancelled'),
('confirmed','Confirmed'),
('exception','Exception'),
('running','Running'),
('cancel','Cancel'),
('ready','Ready'),
('done','Done'),
('waiting','Waiting')], 'State', required=True,

22
addons/procurement/procurement_view.xml
View File

@ -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>

2
addons/purchase/purchase_view.xml
View File

@ -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>

2
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -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>