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

[FIX] sale: final invoice with downpayment amount fix

Browse Source 
Downpayment might have been determined by a fixed amount set by the user.
This amount is tax included. This can lead to rounding issues.
E.g. a user wants a 100€ DP on a product with 21% tax.
100 / 1.21 = 82.64, 82.64 * 1,21 = 99.99
This is already corrected by adding/removing the missing cents on the DP invoice
but it would still be wrong when creating the final invoice (as it is based on the actual base amount + tax of the SO DP's)

opw-3466409

X-original-commit: 0a6e2d47107727040664176740535707286a1355
Part-of: odoo/odoo#135698
This commit is contained in:
jbw-odoo
2023-09-22 15:06:03 +00:00
parent 576afb3f27
commit 68d43d2d05
2 changed files with 111 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/models/sale_order.py
+22
View File
@@ -1332,6 +1332,28 @@ class SaleOrder(models.Model):
if final:
moves.sudo().filtered(lambda m: m.amount_total < 0).action_switch_move_type()
for move in moves:
# Downpayment might have been determined by a fixed amount set by the user.
# This amount is tax included. This can lead to rounding issues.
# E.g. a user wants a 100€ DP on a product with 21% tax.
# 100 / 1.21 = 82.64, 82.64 * 1,21 = 99.99
# This is already corrected by adding/removing the missing cents on the DP invoice,
# but must also be accounted for on the final invoice.
# only check for invoiced dp lines
dp_invoice_lines = self.order_line.filtered('is_downpayment').invoice_lines\
.filtered(lambda il: il.move_id != move and il.move_id.state != 'cancel')
dp_lines = move.line_ids.filtered(lambda l: l.sale_line_ids.invoice_lines & dp_invoice_lines)
if final and dp_lines:
delta_amount = sum(dp_invoice_lines.mapped('price_total')) +\
(sum(dp_lines.mapped('price_total')) * (1 if move.is_inbound() else -1))
if not self.currency_id.is_zero(delta_amount):
product_line = move.line_ids\
.filtered(lambda aml: aml.display_type == 'product' and aml.is_downpayment)[:1]
tax_line = move.line_ids\
.filtered(lambda aml: aml.tax_line_id.amount_type not in (False, 'fixed'))[:1]
if tax_line and product_line:
tax_line.amount_currency += delta_amount
product_line.price_total -= delta_amount
move.message_post_with_source(
'mail.message_origin_link',
render_values={'self': move, 'origin': move.line_ids.sale_line_ids.order_id},
addons/sale/tests/test_sale_order_down_payment.py
+89
View File
@@ -462,3 +462,92 @@ class TestSaleOrderDownPayment(TestSaleCommon):
invoice.action_post()
downpayment = self.env['sale.advance.payment.inv'].with_context(so_context).create(payment_params)
self.assertEqual(downpayment.amount_invoiced, 550.0, "Amount invoiced is not equal to downpayment amount")
def test_tax_price_include_amount_rounding_final_invoice(self):
"""Test downpayment fixed amount rounding from downpayment to final invoice.
Downpayment fixed amount is tax incl. This can lead to rounding problems, e.g. :
Fixed amount = 100€, tax is 21%
100 / 1.21 = 82.64, 82.64 * 1.21 = 99.99 -> 100€ does not correspond to any base amount + 21% tax."""
tax_21_a = self.create_tax(21)
tax_21_b = self.create_tax(21)
self.sale_order.order_line[0].product_uom_qty = 1
self.sale_order.order_line[0].qty_delivered = 1
self.sale_order.order_line[0].tax_id = tax_21_a
self.sale_order.order_line[0].price_unit = 1000
self.sale_order.order_line[1].product_uom_qty = 1
self.sale_order.order_line[1].qty_delivered = 1
self.sale_order.order_line[1].tax_id = tax_21_b
self.sale_order.order_line[1].price_unit = 1000
self.sale_order.order_line[2:].unlink()
self.sale_order.action_confirm()
so_context = {
'active_model': 'sale.order',
'active_ids': [self.sale_order.id],
'active_id': self.sale_order.id,
'default_journal_id': self.company_data['default_journal_sale'].id,
}
payment_params = {
'advance_payment_method': 'fixed',
'fixed_amount': 200.0,
'deposit_account_id': self.revenue_account.id,
}
downpayment = self.env['sale.advance.payment.inv'].with_context(so_context).create(payment_params)
downpayment.create_invoices()
invoice = self.sale_order.invoice_ids
# pylint: disable=C0326
expected = [
# keys
['account_id', 'tax_ids', 'balance', 'price_total'],
# base lines
[self.revenue_account.id, tax_21_a.ids, -82.64, 100.01 ],
[self.revenue_account.id, tax_21_b.ids, -82.64, 99.99 ],
# taxes
[self.tax_account.id, self.env['account.tax'], -17.37, 0.0 ],
[self.tax_account.id, self.env['account.tax'], -17.35, 0.0 ],
# receivable
[self.receivable_account.id, self.env['account.tax'], 200.0, 0.0 ],
]
self._assert_invoice_lines_values(invoice.line_ids, expected)
invoice.action_post()
downpayment = self.env['sale.advance.payment.inv'].with_context(so_context).create(payment_params)
self.assertEqual(downpayment.amount_invoiced, 200.0, "Amount invoiced is not equal to downpayment amount")
# final invoice
payment_params = {
'advance_payment_method': 'delivered',
'deposit_account_id': self.revenue_account.id,
}
downpayment = self.env['sale.advance.payment.inv'].with_context(so_context).create(payment_params)
downpayment.create_invoices()
invoice = self.sale_order.invoice_ids
# pylint: disable=C0326
expected = [
# keys
['account_id', 'tax_ids', 'balance', 'price_total'],
# base lines
[self.revenue_account.id, tax_21_a.ids, -1000.0, 1210.0 ],
[self.revenue_account.id, tax_21_b.ids, -1000.0, 1210.0 ],
# line section
[self.env['account.account'], self.env['account.tax'], 0.0, 0.0 ],
# down payment
[self.revenue_account.id, tax_21_a.ids, 82.64, -100.01 ],
[self.revenue_account.id, tax_21_b.ids, 82.64, -99.99 ],
# taxes
[self.tax_account.id, self.env['account.tax'], -192.63, 0.0 ],
[self.tax_account.id, self.env['account.tax'], -192.65, 0.0 ],
# receivable
[self.receivable_account.id, self.env['account.tax'], 2220.0, 0.0 ],
# down payment
[self.revenue_account.id, tax_21_a.ids, -82.64, 100.01 ],
[self.revenue_account.id, tax_21_b.ids, -82.64, 99.99 ],
# taxes
[self.tax_account.id, self.env['account.tax'], -17.37, 0.0 ],
[self.tax_account.id, self.env['account.tax'], -17.35, 0.0 ],
# receivable
[self.receivable_account.id, self.env['account.tax'], 200.0, 0.0 ],
]
self._assert_invoice_lines_values(invoice.line_ids, expected)