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

[FIX] sale: should not create the invoice directly, make as on demands 

bzr revid: hmo@tinyerp.com-20120913131808-rr6bfu9chszdn533
This commit is contained in:
Harry (OpenERP) 2012-09-13 18:48:08 +05:30
parent 1e29f75280
commit 9eb850d552
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/sale/sale.py
View File

@ -758,7 +758,7 @@ class sale_order(osv.osv):
for o in self.browse(cr, uid, ids):
if not o.order_line:
raise osv.except_osv(_('Error!'),_('You cannot confirm a sale order which has no line.'))
if (o.order_policy == 'manual'):
if (o.order_policy == 'manual' or self.test_no_product(cr, uid, [o.id])):
self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)})
else:
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)})

2
addons/sale/sale_workflow.xml
View File

@ -196,7 +196,7 @@
<record id="trans_wait_invoice_invoice" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice"/>
<field name="condition">(order_policy=='prepaid') or test_no_product()</field>
<field name="condition">order_policy=='prepaid'</field>
</record>
<record id="trans_wait_invoice_invoice_manual" model="workflow.transition">