From 239e1618f28e997ab4516c4d88d7e4c1edbd0ef8 Mon Sep 17 00:00:00 2001 From: Arthur Maniet Date: Mon, 5 Jan 2015 16:29:08 +0100 Subject: [PATCH] [FIX] account: do not restrict tax move lines creation from account_move_line.create() --- addons/account/account_move_line.py | 2 -- addons/account_voucher/account_voucher.py | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 1d01ac84412..91a69dbb825 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1341,8 +1341,6 @@ class account_move_line(osv.osv): tax_sign = 'ref_tax_sign' base_adjusted = False for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00, force_excluded=False).get('taxes'): - if bool(tax[base_code]) != bool(tax[tax_code]): - raise osv.except_osv(_('Tax misconfiguration !'), _('You cannot apply a tax which doesn\'t have a base code and a tax code. Please fix the configuration of tax %s.') % tax['name']) #create the base movement if base_adjusted == False: base_adjusted = True diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 9f9196521cc..b1e8e8ecb08 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -1237,6 +1237,11 @@ class account_voucher(osv.osv): 'account_tax_id': voucher.tax_id.id, }) + if move_line.get('account_tax_id', False): + tax_data = tax_obj.browse(cr, uid, [move_line['account_tax_id']], context=context)[0] + if not (tax_data.base_code_id and tax_data.tax_code_id): + raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name)) + # compute the amount in foreign currency foreign_currency_diff = 0.0 amount_currency = False