From: Jean-Christophe VASSORT <jcv@openerp.com>
Date: Fri, 24 Feb 2012 12:51:45 +0000 (+0100)
Subject: [MERGE] OPW 18123
X-Git-Tag: 6.0.4-server~27
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=39410d9d6298507df7b2142a85c2a11291acbeb2;p=odoo%2Fodoo.git

[MERGE] OPW 18123

bzr revid: jcv@openerp.com-20120224125145-9xmoz6kmq9ig6eh1
---

39410d9d6298507df7b2142a85c2a11291acbeb2
diff --cc addons/account_voucher/account_voucher.py
index c2b06c5,8fcbf5f..c4bfe29
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@@ -874,8 -855,8 +874,8 @@@ class account_voucher_line(osv.osv)
          'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
          'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
          'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
--        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True),
-         'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
++        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True, digits_compute=dp.get_precision('Account')),
+         'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Account')),
          'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
      }
      _defaults = {