improved_currency

bzr revid: fp@tinyerp.com-20081124105629-qadghr2z23q7r3cy
This commit is contained in:
Fabien Pinckaers
2008-11-24 11:56:29 +01:00
parent 1aeba905db
commit ab4e620e83
3 changed files with 3 additions and 5 deletions
+1 -3
View File
@@ -47,12 +47,10 @@ class mrp_production_workcenter_line(osv.osv):
'date_planned': fields.related('production_id', 'date_planned', string='Date Planned', type="datetime"),
'date_start': fields.datetime('Start Date'),
'date_finnished': fields.datetime('End Date'),
'delay': fields.char('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True),
'delay': fields.float('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True),
'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product'),
'qty':fields.related('production_id','product_qty',type='float',string='Qty'),
'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM'),
}
_defaults = {
'state': lambda *a: 'draft',
+1 -1
View File
@@ -63,7 +63,7 @@ class purchase_order(osv.osv):
cur=order.pricelist_id.currency_id
for line in order.order_line:
for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
val+= cur_obj.round(cr, uid, cur, c['amount'])
val+= c['amount']
res[order.id]=cur_obj.round(cr, uid, cur, val)
return res
+1 -1
View File
@@ -79,7 +79,7 @@ class sale_order(osv.osv):
cur=order.pricelist_id.currency_id
for line in order.order_line:
for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id, order.partner_id):
val+= cur_obj.round(cr, uid, cur, c['amount'])
val+= c['amount']
res[order.id]=cur_obj.round(cr, uid, cur, val)
return res