From 7fb72969d650dc211e34dbffc42e32df3f0e2c44 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 17 Sep 2011 13:44:43 +0200 Subject: [PATCH] fix bzr revid: fp@tinyerp.com-20110917114443-le0ik5o5h7j6a5pl --- addons/account_voucher/account_voucher.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 1255b933bfa..f1718a1e808 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -296,13 +296,9 @@ class account_voucher(osv.osv): 'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}), 'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}), -<<<<<<< TREE 'writeoff_amount': fields.function(_get_writeoff_amount, string='Write-Off Amount', type='float', readonly=True, multi="writeoff"), 'currency_rate_difference': fields.function(_get_writeoff_amount, string="Currency Rate Difference", type='float', multi="writeoff"), -======= - 'writeoff_amount': fields.function(_get_writeoff_amount, string='Write-Off Amount', type='float', readonly=True), 'paid': fields.function(_check_paid, string='Paid', type='boolean', help="The Voucher has been totally paid."), ->>>>>>> MERGE-SOURCE } _defaults = { 'period_id': _get_period,