[MERGE] forward port of branch saas-3 up to 2ffbb5f
This commit is contained in:
commit
ba54a668d4
|
@ -37,7 +37,7 @@ class sale_order_line(osv.osv):
|
||||||
to_cur = self.pool.get('product.pricelist').browse(cr, uid, [pricelist])[0].currency_id.id
|
to_cur = self.pool.get('product.pricelist').browse(cr, uid, [pricelist])[0].currency_id.id
|
||||||
if product:
|
if product:
|
||||||
product = self.pool['product.product'].browse(cr, uid, product, context=context)
|
product = self.pool['product.product'].browse(cr, uid, product, context=context)
|
||||||
purchase_price = product.price_get(ptype='standard_price', context=dict(context, currency_id=to_cur))[product.id]
|
purchase_price = product.standard_price
|
||||||
to_uom = res.get('product_uom', uom)
|
to_uom = res.get('product_uom', uom)
|
||||||
if to_uom != product.uom_id.id:
|
if to_uom != product.uom_id.id:
|
||||||
purchase_price = self.pool['product.uom']._compute_price(cr, uid, product.uom_id.id, purchase_price, to_uom)
|
purchase_price = self.pool['product.uom']._compute_price(cr, uid, product.uom_id.id, purchase_price, to_uom)
|
||||||
|
|
|
@ -354,6 +354,8 @@ class TinyPoFile(object):
|
||||||
elif line.startswith('#,') and (line[2:].strip() == 'fuzzy'):
|
elif line.startswith('#,') and (line[2:].strip() == 'fuzzy'):
|
||||||
fuzzy = True
|
fuzzy = True
|
||||||
line = self.lines.pop(0).strip()
|
line = self.lines.pop(0).strip()
|
||||||
|
if not self.lines:
|
||||||
|
raise StopIteration()
|
||||||
while not line:
|
while not line:
|
||||||
# allow empty lines between comments and msgid
|
# allow empty lines between comments and msgid
|
||||||
line = self.lines.pop(0).strip()
|
line = self.lines.pop(0).strip()
|
||||||
|
|
Loading…
Reference in New Issue