Skip to content

Commit a1af501

Browse files
committed
Merge remote-tracking branch 'upstream/version-15-hotfix' into version-15
2 parents 4449ad3 + f96951e commit a1af501

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/server-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
6767
6868
- name: Cache pip
69-
uses: actions/cache@v3
69+
uses: actions/cache@v4
7070
with:
7171
path: ~/.cache/pip
7272
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py', '**/setup.cfg') }}
@@ -78,7 +78,7 @@ jobs:
7878
id: yarn-cache-dir-path
7979
run: 'echo "::set-output name=dir::$(yarn cache dir)"'
8080

81-
- uses: actions/cache@v3
81+
- uses: actions/cache@v4
8282
id: yarn-cache
8383
with:
8484
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

banking/ebics/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ def sync_ebics_transactions(
138138
)
139139
continue
140140

141+
if camt_document._type in ("camt.053.001.08", "camt.052.001.08"):
142+
# Recognize a batch solely by the presence of the Btch element or more than one subtransaction.
143+
camt_document._strict_batch_parsing = True
144+
141145
for transaction in camt_document:
142146
if transaction.status and transaction.status != "BOOK":
143147
# Skip PDNG and INFO transactions
@@ -198,7 +202,7 @@ def _create_bank_transaction(
198202
bt.withdrawal = abs(min(amount, 0))
199203
bt.currency = sepa_transaction.amount.currency
200204

201-
bt.description = "\n".join(sepa_transaction.purpose)
205+
bt.description = "\n".join(sepa_transaction.purpose) or sepa_transaction.info
202206
bt.reference_number = sepa_transaction.eref
203207
bt.transaction_id = transaction_id
204208
bt.bank_party_iban = sepa_transaction.iban

0 commit comments

Comments
 (0)