Commit Graph

549 Commits

Author SHA1 Message Date
James Cole
2d8ca363db
Gave method old name back. 2017-01-05 09:08:35 +01:00
James Cole
4241ae035e
Add two new “spentInPeriod” methods that use the collector and not big queries. 2017-01-05 09:07:04 +01:00
James Cole
dbebfe7c07
Remove unused method. 2017-01-05 08:32:31 +01:00
James Cole
c34fb7f037
Cleaned up the category and budget pie charts. 2017-01-03 17:02:17 +01:00
James Cole
27cd9fac8a
This fixes #513 [skip ci] 2017-01-02 08:07:28 +01:00
James Cole
a5036c86dc
Updated test database. 2016-12-30 13:47:23 +01:00
James Cole
ac86e75233
Updated various files for #506 2016-12-30 13:45:02 +01:00
James Cole
02bbdcc251
Fix reports and charts for #508 2016-12-30 08:41:48 +01:00
James Cole
a37f70947b
Various code cleanup. 2016-12-28 16:45:44 +01:00
James Cole
619500ca64
Various cod e clean up. 2016-12-28 13:02:56 +01:00
James Cole
94e51952f4
More fields for query. 2016-12-28 06:09:48 +01:00
James Cole
1aee3d8e2c
Various code cleanup 2016-12-27 20:52:00 +01:00
James Cole
f2f9f8fbab Various bug fixes and extensions to test routine. 2016-12-25 11:50:42 +01:00
James Cole
8fb9577660
Add some debug, fix balance report bug. 2016-12-22 21:45:04 +01:00
James Cole
b6aa79bb38
Various code cleanup. Removed executable flags, added newlines. 2016-12-22 19:42:45 +01:00
James Cole
e247aace8d
Various code cleanup. 2016-12-15 17:16:46 +01:00
James Cole
848cfabcba Rearrange code [skip ci] 2016-12-14 18:59:12 +01:00
James Cole
2ca584f097
Fix test. 2016-12-06 09:12:04 +01:00
James Cole
687da83feb
Remove unused collections [skip ci] 2016-12-06 09:09:05 +01:00
James Cole
628c7cd055
Many more route fixes. 2016-12-06 08:59:08 +01:00
James Cole
f4887bbbf7
More routes and pages fixed. 2016-12-06 08:15:53 +01:00
James Cole
6b56c2bf7c Many new renamed routes that will break half of Firefly. 2016-12-05 21:58:23 +01:00
James Cole
d91b9e71d5 Remove unused code. 2016-12-05 20:44:20 +01:00
James Cole
344916d57e Catch encrypted opposing accounts. [skip ci] 2016-12-05 20:39:17 +01:00
James Cole
f4b9b7ae84
Various report updates and code cleanup. 2016-12-04 18:02:19 +01:00
James Cole
b032825342
Building report from issue #386 2016-12-03 21:03:20 +01:00
James Cole
8377a2a0de Building report from issue #386 2016-12-03 20:38:13 +01:00
James Cole
b33aa733c7
Fix some minor scrutinizer issues. 2016-11-28 20:38:03 +01:00
James Cole
d6c7ff0ccb Chart for budget report will also include split journals. 2016-11-26 07:18:20 +01:00
James Cole
28f655dba1 This code makes sure the budget report also includes split expenses. 2016-11-26 07:09:02 +01:00
James Cole
8baea2feb9
Code for #385 2016-11-20 18:31:29 +01:00
James Cole
78f297e18f
Fixed some display bugs for split journals. 2016-11-20 14:17:16 +01:00
James Cole
9340ca09e6
Fixed #408 2016-11-20 12:08:43 +01:00
James Cole
94875adb6c
Various code cleanup. 2016-11-20 11:43:19 +01:00
James Cole
50b72cf229
More chart optimisations. 2016-11-19 13:37:44 +01:00
James Cole
ee6b72afa5
Fix some bugs related to cash accounts. 2016-11-19 12:57:35 +01:00
James Cole
781621960d
Make sure chart is displayed. 2016-11-19 09:26:32 +01:00
James Cole
e15ea04186
Join two charts, simpler code. 2016-11-19 07:27:54 +01:00
James Cole
750b9d8038
Reduce number of queries. 2016-11-12 21:06:48 +01:00
James Cole
6d60d64a82
Some extended code for the category report. 2016-11-12 06:48:38 +01:00
James Cole
5d4f1bc76d First working example of category report. No content, just place holders. #396 2016-11-10 06:23:21 +01:00
James Cole
a08dfe1e3c Add interface for journal collector. 2016-11-08 20:36:09 +01:00
James Cole
77e2cf40df
Removed more getJournals functions in favour of the collector. 2016-11-06 08:08:06 +01:00
James Cole
ee6e047596
Do not order the count query. 2016-11-05 18:55:09 +01:00
James Cole
962cad33e2
Code cleanup. 2016-11-05 18:43:18 +01:00
James Cole
1e2124c5ed
Moved more stuff to the journal collector. 2016-11-05 18:08:44 +01:00
James Cole
37435da459
Moved more stuff to the journal collector. 2016-11-05 17:47:50 +01:00
James Cole
13e1292bb7
Automated code cleanup [skip ci] 2016-11-05 11:47:21 +01:00
James Cole
43afdb021a
Move collecting journals to the collector. 2016-11-05 11:24:15 +01:00
James Cole
aeca2ef3b2
Move some code around 2016-11-05 10:42:31 +01:00
James Cole
46649fe228
Solved group thing. 2016-11-05 10:26:57 +01:00
James Cole
98160e9b63
Expand use of journal collector. 2016-11-05 08:46:55 +01:00
James Cole
9c5d192d90
Journal collector may not have been a bad idea after all! 2016-11-05 08:27:25 +01:00
James Cole
e24f5ec9f3
Multi year report move to AJAX.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 20:08:11 +01:00
James Cole
2ddd4314f1 Extend help pages. 2016-11-02 14:33:57 +01:00
James Cole
b980b5baea
Small optimisations.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 07:23:11 +01:00
James Cole
5be317d73c
sprintf ALL THE THINGS
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 07:04:14 +01:00
James Cole
124ecb1372
New budget table for multi year report.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 04:55:44 +01:00
James Cole
ed33a054ad This update will make the help method fall back to the English content, if it is available. 2016-10-31 18:31:52 +01:00
James Cole
e2d187d74b Various small bug fixes. 2016-10-24 18:01:15 +02:00
James Cole
48b0620629 New help thing. 2016-10-23 17:33:53 +02:00
James Cole
90f2e27f1f Refactoring income and expense reports. 2016-10-09 09:32:12 +02:00
James Cole
a1f797c4d1 Moved a method around. 2016-10-08 16:04:05 +02:00
James Cole
d0c92a2244 Clean up account report helper. 2016-10-08 15:59:58 +02:00
James Cole
49af6522a8 Some code cleanup. 2016-10-07 05:44:21 +02:00
Sander Kleykens
5c239c91db Convert raw XORs to a construct compatible with Laravel's query builder 2016-10-06 22:27:10 +02:00
James Cole
9920504232 Fixes #346 2016-10-06 05:26:38 +02:00
James Cole
b355c18e0c Some code cleanup and copyright cleanup. [skip ci] 2016-10-05 06:52:15 +02:00
James Cole
bb7c26b77c Some issues fixed for scrutiniser. 2016-09-25 08:20:17 +02:00
James Cole
5ca9099654 Some code fixes. 2016-09-17 09:50:40 +02:00
James Cole
d25d0454fc Code clean up 2016-09-16 12:15:58 +02:00
James Cole
a9444ac702
Code cleanup.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 09:30:52 +02:00
James Cole
d0c6afc3a9 Various code clean up. [skip ci] 2016-08-26 08:21:31 +02:00
James Cole
a2e14f8b8d
Various code clean up.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-24 19:33:58 +02:00
James Cole
541d9ebdd9 Optimised some code. 2016-07-30 16:29:04 +02:00
James Cole
9ffc0936ee Merge branch 'feature/new-csv-import' into develop
# Conflicts:
#	app/Helpers/Csv/Importer.php
2016-06-23 12:15:19 +02:00
James Cole
8ee1676f0a New migrations. 2016-06-18 07:36:15 +02:00
James Cole
6267930938 Work on new chart for year report. 2016-06-16 20:52:30 +02:00
James Cole
beda6ec3a9 Removed old CSV stuff. 2016-06-10 15:25:24 +02:00
James Cole
8da4abf655 Restore helpers (#262) 2016-06-06 09:22:20 +02:00
James Cole
288e713f94
Remove all code related to the CSV importer in preparation of #262
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-22 20:18:16 +02:00
James Cole
f8eb1fa44a
Merge branch 'release/3.9.0'
Signed-off-by: James Cole <thegrumpydictator@gmail.com>

# Conflicts:
#	app/Helpers/Csv/Converter/BillName.php
2016-05-22 16:46:11 +02:00
James Cole
44960e8e42 Various last minute bug fixes. 2016-05-22 15:48:34 +02:00
James Cole
d54e264a91
Cannot create empty tags.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 15:09:25 +02:00
James Cole
0105456828
Copyright notices. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 12:42:21 +02:00
James Cole
563ede822f
Copyright notices. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 12:27:31 +02:00
James Cole
3c3a83330d More moving stuff around. 2016-05-20 11:02:07 +02:00
James Cole
724f423692 Move some stuff around. 2016-05-20 09:45:24 +02:00
James Cole
65b8882ed4 Clean up repository. 2016-05-20 09:25:17 +02:00
James Cole
8c1ae76c7a More tight report thing [skip ci] 2016-05-19 13:39:36 +02:00
James Cole
e23c6521b9 Add expenses. [skip ci] 2016-05-18 14:19:33 +02:00
James Cole
95b7da89f0 Some code cleanup. 2016-05-18 07:01:27 +02:00
James Cole
e113736887 Should fix issue #263 2016-05-17 12:45:31 +02:00
James Cole
5ab8cb38d3 Small change in report [skip ci] 2016-05-16 12:47:43 +02:00
James Cole
5a43e6cb9f Better query for no budget. [skip ci] 2016-05-16 07:13:54 +02:00
James Cole
4effc95c5f Fixed some report bugs. 2016-05-15 19:23:19 +02:00
James Cole
962965b5b7 Code cleanup. 2016-05-15 18:36:40 +02:00
James Cole
eedf6a07f0 Fixed the income report. 2016-05-15 17:46:53 +02:00
James Cole
6a750a998f Remove category chart from report controller. 2016-05-15 16:13:05 +02:00
James Cole
bd818b2dea Code clean up. 2016-05-15 15:39:22 +02:00