[16.0][IMP] Take allow_out_payment into account on payment order #1340

lmarion-source · 2024-08-29T13:15:55Z

A previous MR existed but only when payment order was triggered from invoices.
We added the case also directly from confirm button on payment order

Original PR: #1177

Closes #1330

acsonefho

GJ 💪
Just a minor change 🙏

account_payment_order/models/account_move.py

adrienpeiffer · 2024-09-12T15:37:25Z

/ocabot merge minor

OCA-git-bot · 2024-09-12T15:37:32Z

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-1340-by-adrienpeiffer-bump-minor, awaiting test results.

Signed-off-by adrienpeiffer

pedrobaeza

I have stopped the merge. AFAIK, @sbidoul commented that wants to be able to add the lines, but not to confirm the order, and this is pre-filtering the non-allowed bank accounts previously if I understand the code right.

account_payment_order/models/account_move.py

account_payment_order/models/account_payment_order.py

OCA-git-bot · 2024-09-12T15:41:55Z

@adrienpeiffer your merge command was aborted due to failed check(s), which you can inspect on this commit of 16.0-ocabot-merge-pr-1340-by-adrienpeiffer-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

adrienpeiffer · 2024-09-12T15:53:56Z

@pedrobaeza Not sure to understand. The check is done in draft2open method.

pedrobaeza · 2024-09-12T15:56:44Z

I mean this code for example:

https://github.com/OCA/bank-payment/pull/1340/files#diff-bb6441f4ea06462fe1aae1f093f82c4e57460864b29b209676a6c7ce14e49ef9R156

It's avoiding to include the lines in the order.

adrienpeiffer · 2024-09-12T16:09:30Z

Isn't that exactly the code approved in #1177 ?

pedrobaeza · 2024-09-12T16:30:15Z

OK, I based my review in #1177 (comment). Let me check again.

adrienpeiffer · 2024-09-13T06:57:01Z

@lmarion-source Could you remove blank lines (cfr pedro's review)
@sbidoul If I undersood correctly, you prefer to be able to add lines from invoces even bank account is not validated ?
So basically, we have to remove this line https://github.com/OCA/bank-payment/pull/1340/files#diff-bb6441f4ea06462fe1aae1f093f82c4e57460864b29b209676a6c7ce14e49ef9R158

sbidoul · 2024-09-13T07:40:03Z

If I undersood correctly, you prefer to be able to add lines from invoces even bank account is not validated ?

It is my impression that Odoo Enterprise works like that, and it makes sense to me, since the process of preparing payment orders is distinct from the process of validating bank accounts, and often done by different persons. So I think it's better to let both processes run in parallel and block at the last moment. Cherry on the cake would be a warning when an non validated bank account is used in a payment line, but that can be done in another PR.

gdgellatly · 2024-09-13T08:43:31Z

Hmm, we solved this completely differently. I get the minimal touch here, but we made a seperate module that hit all the places Odoo gets this wrong, mostly purchase order and account move but also payment with a single function on bank to get a valid out payment bank account. Then overrode def _compute_available_partner_bank_ids(self): which for me seems to be the place this belongs

github-actions · 2025-01-26T12:17:23Z

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

sbidoul · 2025-03-02T13:01:10Z

Reopening as I think it needs another review round after the last commits. What's the status of this?

Cedric-Pigeon

I like the approach of letting the user making the payment order and block at the end in case of unvalidated account.
I would be really interested to get it merge soon as I'd need to forward-port it to v17.0

Cedric-Pigeon · 2025-03-15T19:29:42Z

@lmarion-source Could you please resolve conflicts ?

AnizR · 2025-04-30T07:47:14Z

ping @lmarion-source

AnizR

Almost good, thanks!

account_payment_order/models/account_payment_order.py

A previous MR existed but only when payment order was triggered from invoices. We added the case also directement from confirm button on payment order original PR: OCA#1177

AnizR

Code LGTM

Cedric-Pigeon

LGTM

sbidoul · 2025-06-12T09:55:44Z

@pedrobaeza can you update your review here?

sbidoul · 2025-06-12T09:59:16Z

account_payment_order/models/account_payment_order.py

+                        .sudo()
+                        .get_param("account_payment_order.use_allow_out_payment")
+                    ):
+                        payline._check_bank_allows_out_payments()


Don't we need to check that payment_type is outbound here? Because this check does not make sense for a debit order.

sbidoul · 2025-06-12T10:00:09Z

account_payment_order/models/account_move_line.py

@@ -71,10 +71,10 @@ def _prepare_payment_line_vals(self, payment_order):
            # in this case
        if payment_order.payment_type == "outbound":
            amount_currency *= -1
-        partner_bank_id = self.partner_bank_id.id or first(self.partner_id.bank_ids).id
+        partner_bank_id = self.partner_bank_id or first(self.partner_id.bank_ids)


Suggested change

partner_bank_id = self.partner_bank_id or first(self.partner_id.bank_ids)

partner_bank = self.partner_bank_id or first(self.partner_id.bank_ids)

pedrobaeza · 2025-06-21T10:02:34Z

@lmarion-source can you please check the latest comments?

lmarion-source force-pushed the 16.0-account_payment_order_allow_out_payment branch 2 times, most recently from 9a523ec to 386628a Compare August 29, 2024 14:05

acsonefho suggested changes Aug 30, 2024

View reviewed changes

account_payment_order/models/account_move.py Outdated Show resolved Hide resolved

lmarion-source force-pushed the 16.0-account_payment_order_allow_out_payment branch from 386628a to 5f1064e Compare August 30, 2024 06:06

acsonefho approved these changes Aug 30, 2024

View reviewed changes

lmarion-source force-pushed the 16.0-account_payment_order_allow_out_payment branch from 5f1064e to a02bcff Compare September 11, 2024 07:06

acsonefho approved these changes Sep 12, 2024

View reviewed changes

adrienpeiffer approved these changes Sep 12, 2024

View reviewed changes

OCA-git-bot added the approved label Sep 12, 2024

OCA-git-bot added a commit that referenced this pull request Sep 12, 2024

Merge PR #1340 into 16.0

078b2bd

Signed-off-by adrienpeiffer

OCA-git-bot added the bot is merging ⏳ label Sep 12, 2024

pedrobaeza added this to the 16.0 milestone Sep 12, 2024

pedrobaeza requested changes Sep 12, 2024

View reviewed changes

account_payment_order/models/account_move.py Outdated Show resolved Hide resolved

account_payment_order/models/account_payment_order.py Outdated Show resolved Hide resolved

OCA-git-bot removed the approved label Sep 12, 2024

OCA-git-bot removed the bot is merging ⏳ label Sep 12, 2024

pedrobaeza mentioned this pull request Sep 12, 2024

[16.0][IMP] account_payment_order: check that bank allows out-payments #1177

Closed

lmarion-source force-pushed the 16.0-account_payment_order_allow_out_payment branch from a02bcff to 565a13b Compare September 13, 2024 08:10

lmarion-source force-pushed the 16.0-account_payment_order_allow_out_payment branch 3 times, most recently from 1cd2603 to adb3c59 Compare September 26, 2024 14:42

github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Jan 26, 2025

github-actions bot closed this Mar 2, 2025

sbidoul removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Mar 2, 2025

sbidoul reopened this Mar 2, 2025

Cedric-Pigeon approved these changes Mar 10, 2025

View reviewed changes

astirpe added 2 commits April 30, 2025 10:14

[16.0][IMP] account_payment_order: check that bank allows out payments

d6943e5

[IMP] account_payment_mode: set allow_out_payment on demo banks

8f45bcc

lmarion-source force-pushed the 16.0-account_payment_order_allow_out_payment branch 5 times, most recently from 092cb52 to 534deff Compare April 30, 2025 10:40

AnizR suggested changes Apr 30, 2025

View reviewed changes

account_payment_order/models/account_payment_order.py Outdated Show resolved Hide resolved

[16.0][IMP] Take allow_out_payment into account on payment order

f97f52f

A previous MR existed but only when payment order was triggered from invoices. We added the case also directement from confirm button on payment order original PR: OCA#1177

lmarion-source force-pushed the 16.0-account_payment_order_allow_out_payment branch from 534deff to f97f52f Compare April 30, 2025 11:38

AnizR approved these changes Apr 30, 2025

View reviewed changes

Cedric-Pigeon approved these changes May 16, 2025

View reviewed changes

sbidoul reviewed Jun 12, 2025

View reviewed changes

	partner_bank_id = self.partner_bank_id or first(self.partner_id.bank_ids)
	partner_bank = self.partner_bank_id or first(self.partner_id.bank_ids)

Uh oh!

[16.0][IMP] Take allow_out_payment into account on payment order #1340

Are you sure you want to change the base?

[16.0][IMP] Take allow_out_payment into account on payment order #1340

Uh oh!

Conversation

lmarion-source commented Aug 29, 2024 • edited by sbidoul Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

acsonefho left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

adrienpeiffer commented Sep 12, 2024

Uh oh!

OCA-git-bot commented Sep 12, 2024

Uh oh!

pedrobaeza left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

OCA-git-bot commented Sep 12, 2024

Uh oh!

adrienpeiffer commented Sep 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pedrobaeza commented Sep 12, 2024

Uh oh!

adrienpeiffer commented Sep 12, 2024

Uh oh!

pedrobaeza commented Sep 12, 2024

Uh oh!

adrienpeiffer commented Sep 13, 2024

Uh oh!

sbidoul commented Sep 13, 2024

Uh oh!

gdgellatly commented Sep 13, 2024

Uh oh!

github-actions bot commented Jan 26, 2025

Uh oh!

sbidoul commented Mar 2, 2025

Uh oh!

Cedric-Pigeon left a comment

Choose a reason for hiding this comment

Uh oh!

Cedric-Pigeon commented Mar 15, 2025

Uh oh!

AnizR commented Apr 30, 2025

Uh oh!

AnizR left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AnizR left a comment

Choose a reason for hiding this comment

Uh oh!

Cedric-Pigeon left a comment

Choose a reason for hiding this comment

Uh oh!

sbidoul commented Jun 12, 2025

Uh oh!

sbidoul Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

sbidoul Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

pedrobaeza commented Jun 21, 2025

Uh oh!

Uh oh!

lmarion-source commented Aug 29, 2024 •

edited by sbidoul

Loading

adrienpeiffer commented Sep 12, 2024 •

edited

Loading