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

Syncing from upstream OCA/bank-payment (15.0) #1120

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Syncing from upstream OCA/bank-payment (15.0) #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e080a84
[FIX] payment order: fix compute_partner_bank_id
luc-demeyer Nov 4, 2023
7285f3d
Merge PR #1168 into 15.0
OCA-git-bot Feb 14, 2024
18f3fc3
[BOT] post-merge updates
OCA-git-bot Feb 14, 2024
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ addon | version | maintainers | summary
[account_banking_sepa_credit_transfer](account_banking_sepa_credit_transfer/) | 15.0.2.0.3 | | Create SEPA XML files for Credit Transfers
[account_banking_sepa_direct_debit](account_banking_sepa_direct_debit/) | 15.0.2.1.1 | | Create SEPA files for Direct Debit
[account_payment_mode](account_payment_mode/) | 15.0.1.0.3 | | Account Payment Mode
[account_payment_order](account_payment_order/) | 15.0.2.2.2 | | Account Payment Order
[account_payment_order](account_payment_order/) | 15.0.2.2.3 | | Account Payment Order
[account_payment_order_grouped_output](account_payment_order_grouped_output/) | 15.0.1.0.2 | | Account Payment Order - Generate grouped moves
[account_payment_order_return](account_payment_order_return/) | 15.0.1.0.1 | | Account Payment Order Return
[account_payment_partner](account_payment_partner/) | 15.0.1.3.2 | | Adds payment mode on partners and invoices
Expand Down
2 changes: 1 addition & 1 deletion account_payment_order/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Account Payment Order
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1689f5f61c6318ce17f8238da8a5a697db6f23372bf0186e8ccaa1ccb1a87de6
!! source digest: sha256:9b68e14d8c05bab096f9d7cef19a7e073f644aec785e265dea73b165dfbd03d2
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
Expand Down
2 changes: 1 addition & 1 deletion account_payment_order/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{
"name": "Account Payment Order",
"version": "15.0.2.2.2",
"version": "15.0.2.2.3",
"license": "AGPL-3",
"author": "ACSONE SA/NV, "
"Therp BV, "
Expand Down
2 changes: 1 addition & 1 deletion account_payment_order/models/account_move_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _compute_partner_bank_id(self):
if (
ml.move_id.move_type in ("in_invoice", "in_refund")
and not ml.reconciled
and ml.payment_mode_id.payment_order_ok
and (ml.payment_mode_id.payment_order_ok or not ml.payment_mode_id)
and ml.account_id.internal_type in ("receivable", "payable")
and not any(
p_state in ("draft", "open", "generated")
Expand Down
3 changes: 1 addition & 2 deletions account_payment_order/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand Down Expand Up @@ -367,7 +366,7 @@ <h1 class="title">Account Payment Order</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1689f5f61c6318ce17f8238da8a5a697db6f23372bf0186e8ccaa1ccb1a87de6
!! source digest: sha256:9b68e14d8c05bab096f9d7cef19a7e073f644aec785e265dea73b165dfbd03d2
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/bank-payment/tree/15.0/account_payment_order"><img alt="OCA/bank-payment" src="https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/bank-payment-15-0/bank-payment-15-0-account_payment_order"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/bank-payment&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds support for payment orders and debit orders.</p>
Expand Down
Loading