Skip to content

Commit f7d1e8b

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR #4947 into 16.0
Signed-off-by tafaRU
2 parents 0d3fc10 + 3b41e03 commit f7d1e8b

3 files changed

Lines changed: 165 additions & 52 deletions

File tree

‎l10n_it_split_payment/models/account_move.py‎

Lines changed: 75 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# Copyright 2023 Giuseppe Borruso <gborruso@dinamicheaziendali.it>
55
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
66

7-
from odoo import Command, fields, models
7+
from odoo import Command, _, fields, models
8+
from odoo.exceptions import UserError
89
from odoo.tools import float_compare
910

1011

@@ -26,8 +27,6 @@ def _compute_amount(self):
2627
res = super()._compute_amount()
2728
for move in self:
2829
if move.split_payment:
29-
if move.is_purchase_document():
30-
continue
3130
if move.tax_totals:
3231
move.amount_sp = (
3332
move.tax_totals["amount_total"]
@@ -43,14 +42,18 @@ def _compute_amount(self):
4342
return res
4443

4544
def write(self, vals):
45+
if self.env.context.get("skip_split_payment_computation"):
46+
return super().write(vals)
4647
res = super(AccountMove, self.with_context(check_move_validity=False)).write(
4748
vals
4849
)
49-
if self.env.context.get("skip_split_payment_computation"):
50-
return res
51-
self.compute_split_payment()
5250
container = {"records": self}
53-
self._check_balanced(container)
51+
with self._check_balanced(container):
52+
if "fiscal_position_id" in vals:
53+
self._compute_amount()
54+
self.with_context(
55+
skip_split_payment_computation=True, check_move_validity=False
56+
).compute_split_payment()
5457
return res
5558

5659
def copy(self, default=None):
@@ -63,15 +66,57 @@ def copy(self, default=None):
6366
res = super().copy(default=default)
6467
return res
6568

69+
def _build_writeoff_line(self):
70+
self.ensure_one()
71+
72+
if not self.company_id.sp_account_id:
73+
raise UserError(
74+
_(
75+
"Please set 'Split Payment Write-off Account' field in"
76+
" accounting configuration"
77+
)
78+
)
79+
debit = 0
80+
credit = 0
81+
move_tax_lines = self.line_ids.filtered(
82+
lambda line: ((line.display_type == "tax") and (not line.is_split_payment))
83+
)
84+
for tax_line in move_tax_lines:
85+
debit += tax_line.credit
86+
credit += tax_line.debit
87+
if debit != 0 and credit != 0:
88+
if debit >= credit:
89+
debit = debit - credit
90+
credit = 0
91+
else:
92+
credit = credit - debit
93+
debit = 0
94+
95+
vals = {
96+
"name": _("Split Payment Write Off"),
97+
"partner_id": self.partner_id.id,
98+
"account_id": self.company_id.sp_account_id.id,
99+
"journal_id": self.journal_id.id,
100+
"date": self.invoice_date,
101+
"date_maturity": self.invoice_date,
102+
"price_unit": -debit + credit,
103+
"amount_currency": debit - credit,
104+
"debit": debit,
105+
"credit": credit,
106+
"display_type": "tax",
107+
"is_split_payment": True,
108+
}
109+
return vals
110+
66111
def compute_split_payment(self):
67112
for move in self:
68-
if move.split_payment:
113+
if move.is_sale_document(include_receipts=True):
69114
line_sp = fields.first(
70115
move.line_ids.filtered(lambda move_line: move_line.is_split_payment)
71116
)
72-
for line in move.line_ids:
73-
if line.display_type == "tax" and not line.is_split_payment:
74-
write_off_line_vals = line._build_writeoff_line()
117+
with move._sync_dynamic_lines(container={"records": move}):
118+
if move.split_payment:
119+
write_off_line_vals = move._build_writeoff_line()
75120
if line_sp:
76121
if (
77122
float_compare(
@@ -81,9 +126,26 @@ def compute_split_payment(self):
81126
)
82127
!= 0
83128
):
84-
line_sp.write(write_off_line_vals)
129+
line_sp.with_context(
130+
skip_split_payment_computation=True
131+
).write(write_off_line_vals)
85132
else:
86-
if move.amount_sp:
133+
if write_off_line_vals.get("price_unit"):
87134
move.with_context(
88135
skip_split_payment_computation=True
89136
).line_ids = [Command.create(write_off_line_vals)]
137+
elif line_sp:
138+
neutralize_vals = {
139+
"debit": 0.0,
140+
"credit": 0.0,
141+
"amount_currency": 0.0,
142+
"price_unit": 0.0,
143+
"tax_base_amount": 0.0,
144+
"tax_tag_ids": [(6, 0, [])],
145+
}
146+
move.with_context(
147+
skip_split_payment_computation=True,
148+
check_move_validity=False,
149+
).write(
150+
{"line_ids": [Command.update(line_sp.id, neutralize_vals)]}
151+
)

‎l10n_it_split_payment/models/account_move_line.py‎

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# Copyright 2023 Giuseppe Borruso <gborruso@dinamicheaziendali.it>
55
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
66

7-
from odoo import _, api, fields, models
8-
from odoo.exceptions import UserError
7+
from odoo import api, fields, models
8+
from odoo.tools import frozendict
99

1010

1111
class AccountMoveLine(models.Model):
@@ -17,52 +17,43 @@ class AccountMoveLine(models.Model):
1717
def _compute_is_split_payment(self):
1818
for line in self:
1919
line.is_split_payment = False
20-
if line.account_id == line.company_id.sp_account_id:
20+
if line.account_id and line.account_id == line.company_id.sp_account_id:
2121
line.is_split_payment = True
2222

23-
def _build_writeoff_line(self):
24-
self.ensure_one()
25-
26-
if not self.move_id.company_id.sp_account_id:
27-
raise UserError(
28-
_(
29-
"Please set 'Split Payment Write-off Account' field in"
30-
" accounting configuration"
31-
)
32-
)
33-
vals = {
34-
"name": _("Split Payment Write Off"),
35-
"partner_id": self.move_id.partner_id.id,
36-
"account_id": self.move_id.company_id.sp_account_id.id,
37-
"journal_id": self.move_id.journal_id.id,
38-
"date": self.move_id.invoice_date,
39-
"date_maturity": self.move_id.invoice_date,
40-
"price_unit": -self.credit,
41-
"amount_currency": self.credit,
42-
"debit": self.credit,
43-
"credit": self.debit,
44-
"display_type": "tax",
45-
}
46-
if self.move_id.move_type == "out_refund":
47-
vals["amount_currency"] = -self.debit
48-
vals["debit"] = self.credit
49-
vals["credit"] = self.debit
50-
return vals
23+
def _compute_all_tax(self):
24+
res = None
25+
for line in self:
26+
res = super(AccountMoveLine, line)._compute_all_tax()
27+
new_compute_all_tax = {}
28+
for tax_key, tax_vals in line.compute_all_tax.items():
29+
if (
30+
tax_key.get("tax_repartition_line_id")
31+
and tax_key.get("display_type")
32+
and not tax_key.get("is_split_payment")
33+
):
34+
new_tax_key = dict(tax_key)
35+
new_tax_key["is_split_payment"] = False
36+
tax_key = frozendict(new_tax_key)
37+
new_compute_all_tax[tax_key] = tax_vals
38+
line.compute_all_tax = new_compute_all_tax
39+
return res
5140

5241
@api.model_create_multi
5342
def create(self, vals_list):
5443
lines = super().create(vals_list)
44+
move_computed = []
5545
for line in lines:
5646
if (
57-
line.display_type == "tax"
47+
line.move_id not in move_computed
48+
and line.display_type == "tax"
5849
and line.move_id.split_payment
59-
and line.move_id.is_sale_document(include_receipts=True)
6050
and not line.is_split_payment
6151
and not any(ml.is_split_payment for ml in line.move_id.line_ids)
6252
):
63-
write_off_line_vals = line._build_writeoff_line()
64-
line.move_id.line_ids = [(0, 0, write_off_line_vals)]
65-
line.move_id._sync_dynamic_lines(
66-
container={"records": line.move_id, "self": line.move_id}
67-
)
53+
write_off_line_vals = line.move_id._build_writeoff_line()
54+
with line.move_id._sync_dynamic_lines(
55+
container={"records": line.move_id}
56+
):
57+
line.move_id.line_ids = [(0, 0, write_off_line_vals)]
58+
move_computed.append(line.move_id)
6859
return lines

‎l10n_it_split_payment/tests/test_splitpayment.py‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,24 @@ def setUp(self):
2727
"amount": 22,
2828
}
2929
)
30+
self.tax10sp = self.tax_model.create(
31+
{
32+
"name": "10% SP",
33+
"amount": 10,
34+
}
35+
)
3036
self.tax22 = self.tax_model.create(
3137
{
3238
"name": "22%",
3339
"amount": 22,
3440
}
3541
)
42+
self.tax10 = self.tax_model.create(
43+
{
44+
"name": "10%",
45+
"amount": 10,
46+
}
47+
)
3648
self.sp_fp = self.fp_model.create(
3749
{
3850
"name": "Split payment",
@@ -42,7 +54,12 @@ def setUp(self):
4254
0,
4355
0,
4456
{"tax_src_id": self.tax22.id, "tax_dest_id": self.tax22sp.id},
45-
)
57+
),
58+
(
59+
0,
60+
0,
61+
{"tax_src_id": self.tax10.id, "tax_dest_id": self.tax10sp.id},
62+
),
4663
],
4764
}
4865
)
@@ -272,3 +289,46 @@ def test_balanced_lines(self):
272289
self.assertEqual(invoice.amount_total, 200)
273290
self.assertEqual(invoice.amount_residual, 200)
274291
self.assertEqual(invoice.amount_tax, 0)
292+
293+
def test_invoice_two_sp_taxes(self):
294+
self.assertTrue(self.tax22sp.is_split_payment)
295+
self.assertTrue(self.tax10sp.is_split_payment)
296+
invoice = self.move_model.with_context(default_move_type="out_invoice").create(
297+
{
298+
"invoice_date": self.recent_date,
299+
"partner_id": self.env.ref("base.res_partner_3").id,
300+
"journal_id": self.sales_journal.id,
301+
"fiscal_position_id": self.sp_fp.id,
302+
"move_type": "out_refund",
303+
"invoice_line_ids": [
304+
(
305+
0,
306+
0,
307+
{
308+
"name": "service",
309+
"account_id": self.a_sale.id,
310+
"quantity": 1,
311+
"price_unit": 100,
312+
"tax_ids": [(6, 0, {self.tax22sp.id})],
313+
},
314+
),
315+
(
316+
0,
317+
0,
318+
{
319+
"name": "service2",
320+
"account_id": self.a_sale.id,
321+
"quantity": 1,
322+
"price_unit": 100,
323+
"tax_ids": [(6, 0, {self.tax10sp.id})],
324+
},
325+
),
326+
],
327+
}
328+
)
329+
line_sp = invoice.line_ids.filtered(
330+
lambda line: line.account_id.id == self.company.sp_account_id.id
331+
)
332+
333+
self.assertTrue(len(line_sp) == 1)
334+
self.assertEqual(line_sp.credit, 32)

0 commit comments

Comments
 (0)
⚡