kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/csv-import' into develop

Browse Source 
Conflicts:
	composer.json
	composer.lock
	resources/lang/en/form.php
	resources/lang/nl/form.php
This commit is contained in:
James Cole
2015-07-05 08:50:54 +02:00
parent 46493c2af6 9105104303
commit 74c50930bd
42 changed files with 2347 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
database/seeds/TestDataSeeder.php
View File

@@ -98,7 +98,7 @@ class TestDataSeeder extends Seeder
protected function createAssetAccounts()
{
$assets = ['MyBank Checking Account', 'Savings', 'Shared', 'Creditcard'];
$assets = ['MyBank Checking Account', 'Savings', 'Shared', 'Creditcard', 'Emergencies', 'STE'];
$assetMeta = [
[
'accountRole' => 'defaultAsset',
@@ -114,6 +114,12 @@ class TestDataSeeder extends Seeder
'ccMonthlyPaymentDate' => '2015-05-27',
'ccType' => 'monthlyFull'
],
[
'accountRole' => 'savingAsset',
],
[
'accountRole' => 'savingAsset',
],
];