[MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1079205-pja

lp bug: https://launchpad.net/bugs/1079205 fixed

bzr revid: vta@openerp.com-20121204144649-abpod80i1nspeeof
This commit is contained in:
vta vta@openerp.com 2012-12-04 15:46:49 +01:00
commit 6bbe9ad526
1 changed files with 3 additions and 1 deletions

View File

@ -242,7 +242,7 @@ class sale_order(osv.osv):
'order_policy': 'manual',
'state': 'draft',
'user_id': lambda obj, cr, uid, context: uid,
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
'name': lambda obj, cr, uid, context: '/',
'invoice_quantity': 'order',
'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
@ -321,6 +321,8 @@ class sale_order(osv.osv):
return {'value': val}
def create(self, cr, uid, vals, context=None):
if vals.get('name','/')=='/':
vals['name'] = self.pool.get('ir.sequence').get(cr, uid, 'sale.order') or '/'
order = super(sale_order, self).create(cr, uid, vals, context=context)
if order:
self.create_send_note(cr, uid, [order], context=context)