[MERGE] forward port of branch saas-3 up to 162eb84
This commit is contained in:
commit
8ef286a12c
|
@ -52,10 +52,7 @@ class sale_order_line(osv.osv):
|
||||||
for line in self.browse(cr, uid, ids, context=context):
|
for line in self.browse(cr, uid, ids, context=context):
|
||||||
res[line.id] = 0
|
res[line.id] = 0
|
||||||
if line.product_id:
|
if line.product_id:
|
||||||
if line.purchase_price:
|
res[line.id] = round(line.price_subtotal - ((line.purchase_price or line.product_id.standard_price) * line.product_uos_qty), 2)
|
||||||
res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty), 2)
|
|
||||||
else:
|
|
||||||
res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty), 2)
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
|
|
|
@ -948,7 +948,7 @@
|
||||||
<field name="name">Malaysia</field>
|
<field name="name">Malaysia</field>
|
||||||
<field name="code">my</field>
|
<field name="code">my</field>
|
||||||
<field name="image" type="base64" file="base/static/img/country_flags/my.png"></field>
|
<field name="image" type="base64" file="base/static/img/country_flags/my.png"></field>
|
||||||
<field name="currency_id" ref="MXN"/>
|
<field name="currency_id" ref="MYR"/>
|
||||||
</record>
|
</record>
|
||||||
<record id="mz" model="res.country">
|
<record id="mz" model="res.country">
|
||||||
<field name="name">Mozambique</field>
|
<field name="name">Mozambique</field>
|
||||||
|
|
Loading…
Reference in New Issue