667 Commits

Author	SHA1	Message	Date
James Cole	f63c6875cd	Initial code base for tag report.	2017-02-24 20:01:35 +01:00
James Cole	b5032a7597	Added a new helper function.	2017-02-19 07:34:39 +01:00
James Cole	5d0cdc4ffa	Various code cleanup.	2017-02-17 06:42:36 +01:00
James Cole	466ec92492	Remove some commented code.	2017-02-16 22:34:37 +01:00
James Cole	8f5289b7dc	Fixed some transaction list filter issues.	2017-02-15 21:55:50 +01:00
James Cole	395a7bb33c	This should fix the tests	2017-02-15 17:07:56 +01:00
James Cole	636b371b86	Fixes #553	2017-02-15 16:20:16 +01:00
James Cole	4c2d9e0eee	Small code cleanup.	2017-02-11 15:52:55 +01:00
James Cole	5e47492318	Clean up budget report partial	2017-02-11 10:05:58 +01:00
James Cole	aa2d78f36a	Expand filter	2017-02-11 09:34:04 +01:00
James Cole	3914796e4e	Experimental new transfer filter.	2017-02-10 17:21:44 +01:00
James Cole	dba92d73c4	Include new line at the end of the file.	2017-02-05 19:51:58 +01:00
James Cole	8a98204a69	Update app() calls	2017-02-05 16:16:15 +01:00
James Cole	2c786e6a38	Small fixes to collector because constructor is gone.	2017-01-30 17:09:44 +01:00
James Cole	c7341c9194	Also extend collector.	2017-01-30 16:57:00 +01:00
James Cole	be868d37f2	Fixed some issues with the monthly report and missing amounts.	2017-01-19 21:54:27 +01:00
James Cole	08ac27cccf	Fix some scrutiniser issues.	2017-01-14 19:43:33 +01:00
James Cole	a872cf7061	Renamed the other method.	2017-01-05 09:10:04 +01:00
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
James Cole	4870945af2	Remove references to unused library.	2016-05-14 21:55:43 +02:00
James Cole	771926c779	No longer needed.	2016-05-14 14:02:37 +02:00
James Cole	863227c55c	Some refactoring.	2016-05-14 13:51:33 +02:00
James Cole	20e1e50032	Refactoring.	2016-05-13 15:53:39 +02:00
James Cole	ed9acbdfde	Reinstate report.	2016-05-11 09:08:18 +02:00
James Cole	dc825d5a9c	Fix queries.	2016-05-11 08:40:22 +02:00
James Cole	d233a2df3c	Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop ... * 'develop' of https://github.com/JC5/firefly-iii: Should fix frontpage. # Conflicts: # app/Models/TransactionJournal.php # app/Repositories/Account/AccountRepository.php	2016-05-11 06:08:05 +02:00
James Cole	98e683329e	New stuff for categories and transactions.	2016-05-08 13:45:23 +02:00
James Cole	0460811e6c	Fixed some more charts.	2016-05-06 22:53:08 +02:00
James Cole	6d944ec98f	More cleanup for budgets.	2016-05-06 06:15:46 +02:00
James Cole	adf6691470	This breaks everything budget-related.	2016-05-05 22:03:35 +02:00
James Cole	dd8b500efd	These budget charts are the worst, I'm telling you.	2016-05-05 21:25:20 +02:00
James Cole	3344bb7263	Code cleanup.	2016-05-02 20:49:19 +02:00
James Cole	5e1167b8ae	Code cleanup.	2016-05-01 15:05:29 +02:00
James Cole	4ec6bcc8c7	More code for split and small bug fix in attachment helper.	2016-04-30 09:48:39 +02:00
James Cole	baff9780de	Smaller report. [skip ci]	2016-04-29 11:05:52 +02:00
James Cole	14b94a5bd2	Simplified some code.	2016-04-29 08:56:56 +02:00
James Cole	ea014a6504	Some code simplifications.	2016-04-28 16:30:21 +02:00
James Cole	e28e66e8f1	Fix ABN AMRO importer	2016-04-28 16:23:21 +02:00
James Cole	b47a140c2f	Updates to budgets.	2016-04-28 10:59:36 +02:00
James Cole	e3437ba697	Various code cleanup.	2016-04-27 19:21:47 +02:00
James Cole	84f299c33b	Forgot a return statement.	2016-04-27 10:39:27 +02:00
James Cole	3d4489efe6	Code cleanup.	2016-04-27 10:38:51 +02:00
James Cole	6aa50e3c00	@roberthorlings I have no idea if this is a correct fix.	2016-04-27 09:20:51 +02:00
James Cole	b70498c337	Some cleaning up.	2016-04-27 06:46:02 +02:00
James Cole	f34aa77d1d	Cleaned up some code.	2016-04-27 06:43:17 +02:00
James Cole	3833a41acb	Fix sorting.	2016-04-27 06:19:13 +02:00
James Cole	66f2df9677	Some code cleanup and I sneaked in a chart optimisation.	2016-04-26 22:21:34 +02:00
James Cole	da202317c0	Code cleanup.	2016-04-26 21:40:15 +02:00
James Cole	dfbe6e5b6e	Code clean up. [skip ci]	2016-04-26 12:39:29 +02:00
James Cole	d551333fa2	Some cleaning up and more charts.	2016-04-26 09:21:57 +02:00
James Cole	01cab599bb	And now to make sure it works.	2016-04-26 08:11:26 +02:00
James Cole	1c8834fffb	Some code cleaning up and refactoring.	2016-04-26 08:09:10 +02:00
James Cole	eb5e55a272	Some code cleanup. Fixes the tests.	2016-04-25 18:43:09 +02:00
James Cole	53c80aaef8	Small optimizations to reports.	2016-04-25 14:53:41 +02:00
James Cole	ed863986a7	Fine tuning. [skip ci]	2016-04-24 20:28:08 +02:00
James Cole	2cfbfd8649	Start of better budget charts.	2016-04-24 20:00:20 +02:00
James Cole	3f6c19dec4	Merge branch 'release/3.8.4' ... # Conflicts: # app/Helpers/Csv/PostProcessing/Bill.php	2016-04-24 18:48:16 +02:00
James Cole	99c219ed97	Three fixes courtesy of user @Bonno	2016-04-24 12:24:59 +02:00
James Cole	cce4ef19e5	Fix #244	2016-04-18 19:34:15 +02:00
James Cole	2c6643d691	Fix #243	2016-04-18 14:15:10 +02:00
James Cole	d02df46517	Fix bug in bill name import routine	2016-04-17 20:40:26 +02:00
James Cole	1fc31b4d8f	Fixed a bug courtesy of Johan.	2016-04-17 11:28:44 +02:00
James Cole	0715b7406e	Add language in cache as well.	2016-04-09 09:27:04 +02:00
James Cole	6f0f6e86a1	Small bug fixes.	2016-04-09 09:10:11 +02:00
James Cole	32190db8bb	Fixed tests.	2016-04-06 21:05:43 +02:00
James Cole	250b2c2f53	PHP7 compatible function definitions.	2016-04-06 16:37:28 +02:00
James Cole	c8440af9a5	PHP7 compatible function definitions.	2016-04-06 09:27:45 +02:00
James Cole	697a02ffee	Page titles.	2016-04-03 10:34:42 +02:00
James Cole	3277858c5a	Code cleanup. [skip ci]	2016-04-01 16:44:46 +02:00
James Cole	fa38c975b6	New converters for #180 (Tag and accounts)	2016-04-01 14:17:12 +02:00
James Cole	c14fa1021c	New converters for #180 (Currency)	2016-04-01 14:10:08 +02:00
James Cole	5e78cc02bd	New converters for #180 (Category and some other stuff)	2016-04-01 13:23:12 +02:00
James Cole	429ef80fb9	New converters for #180 (Budget)	2016-04-01 13:17:07 +02:00
James Cole	e4d93cad27	New converters for #180 (Bill)	2016-04-01 13:07:19 +02:00
James Cole	d9a4840e37	New converters for #180	2016-04-01 13:03:38 +02:00
James Cole	a93070b98d	Fixes #234.	2016-04-01 09:13:50 +02:00
James Cole	201790ff8d	Cleanup transaction journal edit. #215	2016-03-20 17:12:34 +01:00
James Cole	ef6ef57e67	Various code cleanup things.	2016-03-19 16:51:52 +01:00
James Cole	fe9b8e834d	Change the precision. Should not influence anything.	2016-03-16 17:47:07 +01:00
James Cole	ababdacf89	Some code cleanup ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-03-14 20:53:56 +01:00
James Cole	b9586481fc	Translate some help text.	2016-03-14 19:46:42 +01:00
James Cole	1aea4045a3	Fixes #151	2016-03-12 07:44:20 +01:00
James Cole	e472e105f2	ING specific amount modifier. See issue #210	2016-03-07 20:00:16 +01:00
James Cole	fcf16051a2	Some general code cleanup.	2016-03-03 08:29:56 +01:00
James Cole	3a236456cd	Fix tag report thing. [skip ci]	2016-03-02 20:44:55 +01:00
James Cole	500243b0b3	This fixes most of the tests.	2016-03-02 13:37:28 +01:00
James Cole	3ef84dc1fc	Cleanup and fix tests.	2016-03-02 13:13:33 +01:00
James Cole	4c35d52234	Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop ... # By Robert Horlings # Via James Cole (2) and Robert Horlings (1) * 'develop' of https://github.com/JC5/firefly-iii: Small bugfix Small bugfix in AbnAmroImport specific	2016-03-01 21:31:42 +01:00
James Cole	01be5e3e23	Tag report.	2016-03-01 21:31:25 +01:00
James Cole	46dc4102e0	Merge pull request #200 from roberthorlings/develop ... Small improvement in AbnAmroImport specific	2016-02-25 16:24:57 +01:00
Robert Horlings	c624c4342f	Small bugfix	2016-02-25 16:19:27 +01:00
Robert Horlings	ec1bb300e2	Small bugfix in AbnAmroImport specific	2016-02-25 14:54:06 +01:00
James Cole	6387114a18	New method to access files.	2016-02-23 16:15:37 +01:00
James Cole	28a4f724d5	Use Requests library to get help from Github.	2016-02-23 16:12:59 +01:00
James Cole	a3bf30a77b	Remove file_get / file_put combi for #193	2016-02-23 09:12:21 +01:00
James Cole	cd66d2c7b0	Return 0 amount. [skip ci]	2016-02-18 10:06:34 +01:00
James Cole	f0f47530bf	PHP7 type declarations.	2016-02-18 10:04:26 +01:00
James Cole	e7be4e3e49	PHP7 compatible type hinting [skip ci]	2016-02-18 07:21:48 +01:00
James Cole	f7d06b9759	Some more code cleanup.	2016-02-17 21:59:47 +01:00
James Cole	a178fed0c6	Code cleanup courtesy of Scrutiniser CI.	2016-02-17 21:55:00 +01:00
James Cole	b1c2f8faa1	Various code cleaning things.	2016-02-17 21:14:32 +01:00