diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 605a71e8b80..cdc858dbbd6 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -77,10 +77,15 @@ class sale_order_line(osv.osv):
list_price = pricelist_obj.price_get(cr, uid, [pricelist],
product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order })
- pricelists = pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
+ so_pricelist = pricelist_obj.browse(cr, uid, pricelist, context=context)
new_list_price = get_real_price(list_price, product.id, qty, uom, pricelist)
- if len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price[pricelist] != 0 and new_list_price != 0:
+ if so_pricelist.visible_discount and list_price[pricelist] != 0 and new_list_price != 0:
+ if so_pricelist.currency_id.id != product.company_id.currency_id.id:
+ # new_list_price is in company's currency while price in pricelist currency
+ new_list_price = self.pool['res.currency'].compute(cr, uid,
+ product.company_id.currency_id.id, so_pricelist.currency_id.id,
+ new_list_price, context=context)
discount = (new_list_price - price) / new_list_price * 100
if discount > 0:
result['price_unit'] = new_list_price
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index e658ddc0fe7..3c3509b8712 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -31,6 +31,7 @@
+
@@ -183,8 +184,8 @@
-
+
+
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 808276c4639..cf73a69f376 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1394,6 +1394,16 @@ class BaseModel(object):
# Failed to write, log to messages, rollback savepoint (to
# avoid broken transaction) and keep going
cr.execute('ROLLBACK TO SAVEPOINT model_load_save')
+ except Exception, e:
+ message = (_('Unknown error during import:') +
+ u' %s: %s' % (type(e), unicode(e)))
+ moreinfo = _('Resolve other errors first')
+ messages.append(dict(info, type='error',
+ message=message,
+ moreinfo=moreinfo))
+ # Failed for some reason, perhaps due to invalid data supplied,
+ # rollback savepoint and keep going
+ cr.execute('ROLLBACK TO SAVEPOINT model_load_save')
if any(message['type'] == 'error' for message in messages):
cr.execute('ROLLBACK TO SAVEPOINT model_load')
ids = False
@@ -4038,6 +4048,8 @@ class BaseModel(object):
self._transient_vacuum(cr, user)
self.check_access_rights(cr, user, 'create')
+
+ vals = self._add_missing_default_values(cr, user, vals, context)
if self._log_access:
for f in LOG_ACCESS_COLUMNS:
@@ -4045,7 +4057,6 @@ class BaseModel(object):
_logger.warning(
'Field `%s` is not allowed when creating the model `%s`.',
f, self._name)
- vals = self._add_missing_default_values(cr, user, vals, context)
tocreate = {}
for v in self._inherits: