pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: make tax audit computation work with more complex CABA uses

Browse Source 
Before this, it was impossible to reconcile an invoice with a credit note, as the tax_audit field's computation found two invoice lines while it expected only one, and crashed.

Note that our current tax report does still not handle all the cases properly:

- Invoices with negative lines using cash basis taxes won't work well, as we can't differentiate a credit note from an invoice using only debit and credit.

- Misc entries reconciled together with cash basis taxes on them ("faking" the invoice and payment) won't work well either, as both of them have the 'entry' type.

>> This commit is a temporary fix, essentially made to unlock customers blocked byt this issue. Another, more complete, fix is coming soon.

closes odoo/odoo#53238

X-original-commit: 8ed0ae8ba593c3b636c0b1e8d5bb41549a45a432
Signed-off-by: Laurent Smet <smetl@users.noreply.github.com>
Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
This commit is contained in:
oco-odoo
2020-06-18 11:18:35 +00:00
parent e6725adca9
commit 26489212f7
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_move.py
+32 -3
View File
@@ -3433,10 +3433,39 @@ class AccountMoveLine(models.Model):
if record.move_id.tax_cash_basis_rec_id:
reconciled_amls = record.move_id.tax_cash_basis_rec_id.debit_move_id + record.move_id.tax_cash_basis_rec_id.credit_move_id
invoice_aml = reconciled_amls.filtered(lambda x: x.journal_id.type in ('sale', 'purchase')) # To exclude the payment
else:
invoice_aml = record
tag_amount = (tag.tax_negate and -1 or 1) * (invoice_aml.move_id.is_inbound() and -1 or 1) * record.balance
if len(invoice_aml) > 1:
caba_origin_inv_journal_type = invoice_aml.mapped('journal_id.type')[0]
type_prefixes = {'sale': 'out', 'purchase': 'in'}
if record.tax_repartition_line_id:
# If tax_repartition_line_id is set, we know for sure we are on a tax line.
# We can then simply check whether the repartition line is intended for invoices or refunds
type_postfix = record.tax_repartition_line_id.invoice_tax_id and 'invoice' or 'refund'
caba_origin_inv_type = "%s_%s" % (type_prefixes[caba_origin_inv_journal_type], type_postfix)
elif record.tax_ids:
# If it's a base line, we rely on debit/credit to guess the type of the CABA origin invoice.
if (caba_origin_inv_journal_type == 'sale' and record.credit) \
or (caba_origin_inv_journal_type == 'purchase' and record.debit):
caba_origin_inv_type = type_prefixes[caba_origin_inv_journal_type] + '_invoice'
else:
caba_origin_inv_type = type_prefixes[caba_origin_inv_journal_type] + '_refund'
else:
# Default type for non-tax related lines is invoice. (in/out depending of the journal)
caba_origin_inv_type = type_prefixes[caba_origin_inv_journal_type] + '_invoice'
if caba_origin_inv_type not in invoice_aml.mapped('move_id.move_type'):
caba_origin_inv_type = type_prefixes[caba_origin_inv_journal_type] + '_invoice'
else:
caba_origin_inv_type = invoice_aml.move_id.move_type
else:
caba_origin_inv_type = record.move_id.move_type
tag_amount = (tag.tax_negate and -1 or 1) * (caba_origin_inv_type in record.move_id.get_inbound_types() and -1 or 1) * record.balance
if tag.tax_report_line_ids:
#Then, the tag comes from a report line, and hence has a + or - sign (also in its name)