summaryrefslogtreecommitdiff
path: root/addons/warning/warning.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2013-11-22 20:31:22 +0100
committerChristophe Simonis <chs@openerp.com>2013-11-22 20:31:22 +0100
commit0244543c71dffdf7a406bd0baa7e3c8e9b01abaa (patch)
treeef645a016b87190137f118e55e7a14430105d3f7 /addons/warning/warning.py
parent162dd9ad178f7ea3d2ecf06a9cf7acbc3d6198c5 (diff)
parent3a7c74ca31e3719592677162672a5010ab9a8fbc (diff)
[MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz
bzr revid: chs@openerp.com-20131122193122-wpdfsfn24ezj1qrp
Diffstat (limited to 'addons/warning/warning.py')
-rw-r--r--addons/warning/warning.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 8e1168e5d35..d582478113a 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -281,7 +281,7 @@ class purchase_order_line(osv.osv):
name=False, price_unit=False, notes=False, context=None):
warning = {}
if not product:
- return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}
+ return {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or '', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
product_obj = self.pool.get('product.product')
product_info = product_obj.browse(cr, uid, product)
title = False