[FIX] Error when manually adding analytic account in the generated tax lines on an invoice
fixes #374 fixes https://bugs.launchpad.net/ocb-addons/+bug/1084822 The fix considers invoice tax lines with different analytic account are equivalent for the purpose of checking if the list of tax line is complete. Caveat, this changes the structure of keys in the dictionary returned by account.invoice.tax's compute method, I suppose this is ok for the master branch.
This commit is contained in:
@@ -712,7 +712,7 @@ class account_invoice(models.Model):
|
||||
for tax in self.tax_line:
|
||||
if tax.manual:
|
||||
continue
|
||||
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id)
|
||||
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
|
||||
tax_key.append(key)
|
||||
if key not in compute_taxes:
|
||||
raise except_orm(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
|
||||
@@ -1549,7 +1549,7 @@ class account_invoice_tax(models.Model):
|
||||
val['account_id'] = tax['account_paid_id'] or line.account_id.id
|
||||
val['account_analytic_id'] = tax['account_analytic_paid_id']
|
||||
|
||||
key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
|
||||
key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
|
||||
if not key in tax_grouped:
|
||||
tax_grouped[key] = val
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user