summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorced <>2007-12-18 08:22:38 +0000
committerced <>2007-12-18 08:22:38 +0000
commitd431277562cceb7c0d2b7500a90e626ccb79b829 (patch)
tree27007407bc68c3275dea209ab65a1ef0fe0cd5b5 /addons
parentd2d7567352c2e65b5a5c915f7492ef19193f786d (diff)
Use Partner reference for invoice name if there is one
bzr revid: ced-27b1c3808d27334adc952aebea76f886aedf7ba1
Diffstat (limited to 'addons')
-rw-r--r--addons/purchase/purchase.py4
-rw-r--r--addons/sale/sale.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 92f7ba8e35c..9ba032336c9 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -86,7 +86,7 @@ class purchase_order(osv.osv):
'name': fields.char('Order Description', size=64, required=True, select=True),
'origin': fields.char('Origin', 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_approve':fields.date('Date Approved'),
'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
inv = {
- 'name': o.name,
+ 'name': o.partner_ref or o.name,
'reference': "P%dPO%d" % (o.partner_id.id, o.id),
'account_id': a,
'type': 'in_invoice',
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c9d042ac5a8..308a57aa37c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -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})
lines.append(inv_line_id)
inv = {
- 'name': order.name,
+ 'name': order.client_order_ref or order.name,
'origin': order.name,
'type': 'out_invoice',
'reference': "P%dSO%d"%(order.partner_id.id,order.id),