kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/credit_calc

Browse Source 
# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue
This commit is contained in:
James Cole
2021-04-27 06:54:38 +02:00
parent 8ef6595ced f03b0569cf
commit 65c49c7a71
259 changed files with 3163 additions and 2520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Transformers/AccountTransformer.php
View File

@@ -117,7 +117,7 @@ class AccountTransformer extends AbstractTransformer
'opening_balance_date' => $openingBalanceDate,
'liability_type' => $liabilityType,
'liability_direction' => $liabilityDirection,
'interest' => (float)$interest,
'interest' => $interest,
'interest_period' => $interestPeriod,
'include_net_worth' => $includeNetWorth,
'longitude' => $longitude,