From 153d6b75eb1de69508ca56ea97cf2927af9b5e46 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Thu, 15 Jul 2010 18:37:11 +0530 Subject: [PATCH] [IMP] account: improve as per decimal_precision module bzr revid: qdp-launchpad@tinyerp.com-20100715130711-3m0akfyrsg1gjp35 --- addons/account/account_bank_statement.py | 5 +++-- addons/account/account_cash_statement.py | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index e0d31b9cf18..d0d8a8e9458 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -25,6 +25,7 @@ from osv import fields, osv from tools.misc import currency from tools.translate import _ +import decimal_precision as dp class account_bank_statement(osv.osv): @@ -130,9 +131,9 @@ class account_bank_statement(osv.osv): states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'cash')]), 'period_id': fields.many2one('account.period', 'Period', required=True, states={'confirm':[('readonly', True)]}), - 'balance_start': fields.float('Starting Balance', digits=(16,2), + 'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly',True)]}), - 'balance_end_real': fields.float('Ending Balance', digits=(16,2), + 'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}), 'balance_end': fields.function(_end_balance, method=True, string='Balance'), 'line_ids': fields.one2many('account.bank.statement.line', diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 1a0727e626f..b6c36dd3337 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -25,6 +25,7 @@ import time from mx import DateTime from decimal import Decimal from tools.translate import _ +import decimal_precision as dp class account_cashbox_line(osv.osv): @@ -55,9 +56,9 @@ class account_cashbox_line(osv.osv): return {'value':{'subtotal': sub or 0.0}} _columns = { - 'pieces': fields.float('Values', digits=(16,2)), + 'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')), 'number': fields.integer('Number'), - 'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)), + 'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')), 'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'), 'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'), } @@ -176,7 +177,7 @@ class account_cash_statement(osv.osv): _columns = { 'company_id':fields.many2one('res.company', 'Company', required=False), 'journal_id': fields.many2one('account.journal', 'Journal', required=True), - 'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"), + 'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"), 'state': fields.selection( [('draft', 'Draft'), ('confirm', 'Confirm'),