Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0][FIX/IMP] account_payment_order: use payment_reference if present for out payments #1371

Closed
wants to merge 1 commit into from
Closed

[14.0][FIX/IMP] account_payment_order: use payment_reference if present for out payments #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion account_payment_order/models/account_move.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def _get_payment_order_communication(self):
if (self.reference_type or "none") != "none":
communication = self.ref
elif self.is_purchase_document():
communication = self.ref or self.payment_reference
communication = self.payment_reference or self.ref or ""
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you really need to add or ""?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added or "" because, in version 16, the _get_payment_order_communication function is divided into two separate methods: _get_payment_order_communication_direct and _get_payment_order_communication_full.

If I remove the or "", the line communication += " " + " ".join(references) throws the error unsupported operand type(s) for +=: 'bool' and 'str', as self.ref can be False. To avoid this issue, we can either split the function as in version 16 or handle it with or "" to ensure communication is always a string.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Undestood, thanks @FrankC013

else:
communication = self.payment_reference or self.name
# If we have credit note(s) - reversal_move_id is a one2many
Expand Down
15 changes: 10 additions & 5 deletions account_payment_order/tests/test_payment_order_outbound.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,9 @@ def test_invoice_communication_01(self):
self.assertEqual("F1243", self.invoice._get_payment_order_communication())

def test_invoice_communication_02(self):
self.invoice.payment_reference = "R1234"
self.assertEqual("F1242", self.invoice._get_payment_order_communication())
self.invoice.payment_reference = "R1234"
self.assertEqual("R1234", self.invoice._get_payment_order_communication())

def test_invoice_communication_03(self):
self.invoice.ref = False
Expand All @@ -303,6 +304,11 @@ def test_invoice_communication_03(self):
self.invoice._get_payment_order_communication(),
)

def test_supplier_invoice_payment_reference(self):
self.invoice.payment_reference = "+++F1234+++"
self.invoice.action_post()
self.assertEqual("+++F1234+++", self.invoice._get_payment_order_communication())

def test_manual_line_and_manual_date(self):
# Create payment order
outbound_order = self.env["account.payment.order"].create(
Expand Down Expand Up @@ -459,7 +465,7 @@ def test_supplier_refund_reference(self):
"""
self.invoice.payment_reference = "F/1234"
self.invoice.action_post()
self.assertEqual("F1242", self.invoice._get_payment_order_communication())
self.assertEqual("F/1234", self.invoice._get_payment_order_communication())
self.refund = self._create_supplier_refund(self.invoice)
with Form(self.refund) as refund_form:
refund_form.ref = "R1234"
Expand All @@ -468,7 +474,7 @@ def test_supplier_refund_reference(self):
line_form.price_unit = 75.0

self.refund.action_post()
self.assertEqual("R1234", self.refund._get_payment_order_communication())
self.assertEqual("FR/1234", self.refund._get_payment_order_communication())

# The user add the outstanding payment to the invoice
invoice_line = self.invoice.line_ids.filtered(
Expand All @@ -490,8 +496,7 @@ def test_supplier_refund_reference(self):

self.assertEqual(len(payment_order.payment_line_ids), 1)

self.assertEqual("F1242 R1234", payment_order.payment_line_ids.communication)
self.assertNotIn("FR/1234", payment_order.payment_line_ids.communication)
self.assertEqual("F/1234 FR/1234", payment_order.payment_line_ids.communication)

def test_supplier_manual_refund(self):
"""
Expand Down
Loading