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

[FIX] purchase: workflow, invoice should not end without invoiced and menu, purchase order lines should be display if does not have link with product for TO Invoice 

bzr revid: hmo@tinyerp.com-20120917080610-gczz23anlt4kcazp
This commit is contained in:
Harry (OpenERP) 2012-09-17 13:36:10 +05:30
parent 6564492a65
commit 16772e8f43
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/purchase_view.xml
View File

@ -519,7 +519,7 @@
<field name="name">On Purchase Order Lines</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order.line</field>
<field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
<field name="domain">['|', ('product_id','=',False),('order_id.invoice_method','&lt;&gt;','picking'),('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="purchase_order_line_search"/>

2
addons/purchase/purchase_workflow.xml
View File

@ -145,7 +145,7 @@
<record id="trans_router_invoice_no_order" model="workflow.transition">
<field name="act_from" ref="act_router"/>
<field name="act_to" ref="act_invoice_end"/>
<field name="condition">invoice_method&lt;&gt;'order'</field>
<field name="condition">invoice_method&lt;&gt;'order' and invoiced</field>
</record>
<record id="trans_except_picking_picking_done" model="workflow.transition">
<field name="act_from" ref="act_except_picking"/>