Use Partner reference for invoice name if there is one
bzr revid: ced-27b1c3808d27334adc952aebea76f886aedf7ba1
This commit is contained in:
parent
d2d7567352
commit
d431277562
|
@ -86,7 +86,7 @@ class purchase_order(osv.osv):
|
||||||
'name': fields.char('Order Description', size=64, required=True, select=True),
|
'name': fields.char('Order Description', size=64, required=True, select=True),
|
||||||
'origin': fields.char('Origin', size=64),
|
'origin': fields.char('Origin', size=64),
|
||||||
'ref': fields.char('Order Reference', size=64),
|
'ref': fields.char('Order Reference', size=64),
|
||||||
'partner_ref': fields.char('Partner Reference', size=64),
|
'partner_ref': fields.char('Partner Ref.', size=64),
|
||||||
'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
|
'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
|
||||||
'date_approve':fields.date('Date Approved'),
|
'date_approve':fields.date('Date Approved'),
|
||||||
'partner_id':fields.many2one('res.partner', 'Partner', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True),
|
'partner_id':fields.many2one('res.partner', 'Partner', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True),
|
||||||
|
@ -208,7 +208,7 @@ class purchase_order(osv.osv):
|
||||||
|
|
||||||
a = o.partner_id.property_account_payable.id
|
a = o.partner_id.property_account_payable.id
|
||||||
inv = {
|
inv = {
|
||||||
'name': o.name,
|
'name': o.partner_ref or o.name,
|
||||||
'reference': "P%dPO%d" % (o.partner_id.id, o.id),
|
'reference': "P%dPO%d" % (o.partner_id.id, o.id),
|
||||||
'account_id': a,
|
'account_id': a,
|
||||||
'type': 'in_invoice',
|
'type': 'in_invoice',
|
||||||
|
|
|
@ -261,7 +261,7 @@ class sale_order(osv.osv):
|
||||||
inv_line_id = self.pool.get('account.invoice.line').copy(cr, uid, preline.id, {'invoice_id':False, 'price_unit':-preline.price_unit})
|
inv_line_id = self.pool.get('account.invoice.line').copy(cr, uid, preline.id, {'invoice_id':False, 'price_unit':-preline.price_unit})
|
||||||
lines.append(inv_line_id)
|
lines.append(inv_line_id)
|
||||||
inv = {
|
inv = {
|
||||||
'name': order.name,
|
'name': order.client_order_ref or order.name,
|
||||||
'origin': order.name,
|
'origin': order.name,
|
||||||
'type': 'out_invoice',
|
'type': 'out_invoice',
|
||||||
'reference': "P%dSO%d"%(order.partner_id.id,order.id),
|
'reference': "P%dSO%d"%(order.partner_id.id,order.id),
|
||||||
|
|
Loading…
Reference in New Issue