kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-01 19:47:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
James Cole
2022-08-03 05:40:31 +02:00
parent 39a928d7f4 aa3fba91d4
commit 4d1b21f70d
68 changed files with 572 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/TransactionRules/Actions/ConvertToTransfer.php
View File

@@ -135,7 +135,7 @@ class ConvertToTransfer implements ActionInterface
DB::table('transaction_journals')
->where('id', '=', $journal['transaction_journal_id'])
->update(['transaction_type_id' => $newType->id]);
->update(['transaction_type_id' => $newType->id, 'bill_id' => null]);
Log::debug('Converted withdrawal to transfer.');
@@ -175,7 +175,7 @@ class ConvertToTransfer implements ActionInterface
DB::table('transaction_journals')
->where('id', '=', $journal['transaction_journal_id'])
->update(['transaction_type_id' => $newType->id]);
->update(['transaction_type_id' => $newType->id, 'bill_id' => null]);
Log::debug('Converted deposit to transfer.');