audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1119 into 16.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-07-24 16:52:50 +00:00
parent f64659dcfc bd445ec935
commit c4ef91a4ea
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
account_payment_order/models/account_move.py
View File

@@ -57,10 +57,9 @@ class AccountMove(models.Model):
for move in self:
if move.state != "posted":
raise UserError(_("The invoice %s is not in Posted state") % move.name)
applicable_lines = move.line_ids.filtered(
pre_applicable_lines = move.line_ids.filtered(
lambda x: (
not x.reconciled
and x.payment_mode_id.payment_order_ok
and x.account_id.account_type
in ("asset_receivable", "liability_payable")
and not any(
@@ -69,6 +68,12 @@ class AccountMove(models.Model):
)
)
)
payment_modes = pre_applicable_lines.mapped("payment_mode_id")
if not payment_modes:
raise UserError(_("No Payment Mode on invoice %s") % move.name)
applicable_lines = pre_applicable_lines.filtered(
lambda x: x.payment_mode_id.payment_order_ok
)
if not applicable_lines:
raise UserError(
_(
@@ -78,9 +83,6 @@ class AccountMove(models.Model):
)
% move.name
)
payment_modes = applicable_lines.mapped("payment_mode_id")
if not payment_modes:
raise UserError(_("No Payment Mode on invoice %s") % move.name)
for payment_mode in payment_modes:
payorder = apoo.search(
move.get_account_payment_domain(payment_mode), limit=1

8
account_payment_order/tests/test_payment_order_outbound.py
View File

@@ -209,6 +209,14 @@ class TestPaymentOrderOutbound(TestPaymentOrderOutboundBase):
self.assertEqual(order.move_ids[0].date, order.payment_ids[0].date)
self.assertEqual(order.state, "uploaded")
def test_account_payment_line_creation_without_payment_mode(self):
self.invoice.payment_mode_id = False
self.invoice.action_post()
with self.assertRaises(UserError):
self.env["account.invoice.payment.line.multi"].with_context(
active_model="account.move", active_ids=self.invoice.ids
).create({}).run()
def test_cancel_payment_order(self):
# Open invoice
self.invoice.action_post()