307 Commits

Author	SHA1	Message	Date
Robert Horlings	a5ac84e1b9	Merge remote-tracking branch 'origin/develop' into feature/abn-amro-import-specifix	2016-01-18 09:09:35 +01:00
Robert Horlings	cbe1f762ca	Fixing a bug with expense account being set to unknown	2016-01-18 09:09:30 +01:00
Robert Horlings	4909fcc8b4	Moved parsing of amount with decimal separator to Converter object	2016-01-17 15:37:49 +01:00
Robert Horlings	323c16ebe1	Implemented additional ABNAMRO description formats	2016-01-17 15:25:47 +01:00
James Cole	e834489206	Some cleaning up courtesy of PHPStorm.	2016-01-16 07:14:36 +01:00
James Cole	7bf75128a8	Some cleaning up courtesy of PHPStorm.	2016-01-15 23:12:52 +01:00
James Cole	7cb86add64	New phpdoc.	2016-01-15 22:13:38 +01:00
James Cole	fbc9720f7a	Clean up some report methods.	2016-01-15 21:50:57 +01:00
James Cole	f69be86c74	Some code cleanup courtesy of PHPStorm.	2016-01-15 17:53:54 +01:00
Robert Horlings	2ff806dedc	Initial version of ABN AMRO import specifix with amount correction and SEPA description parser	2016-01-15 16:48:09 +01:00
Robert Horlings	61a703e605	Implemented option to choose field delimiter in CSV import	2016-01-15 15:24:07 +01:00
James Cole	af29b31ea8	Remove "created by" message.	2016-01-09 15:38:48 +01:00
James Cole	e094871bc9	Merge branch 'release/3.6.1' into develop ... Conflicts: composer.lock	2016-01-09 14:31:52 +01:00
James Cole	cf5cc626d7	Important bug fix.	2016-01-09 14:27:35 +01:00
James Cole	2980860377	Did some code cleanup. Comments and headers mostly.	2016-01-09 08:20:55 +01:00
James Cole	5eb0e18cae	Cleaning up	2016-01-01 21:15:03 +01:00
James Cole	27cabb398e	More queries filtered.	2016-01-01 21:07:15 +01:00
James Cole	64dbb14241	Method no longer used.	2016-01-01 20:05:14 +01:00
James Cole	bb4e2be9eb	Method no longer used.	2016-01-01 20:04:44 +01:00
James Cole	59731878f6	Month report optimised.	2016-01-01 19:46:12 +01:00
James Cole	54ede8aa18	Code cleanup.	2016-01-01 13:54:23 +01:00
James Cole	b415b6b043	Some code cleanup.	2016-01-01 12:41:00 +01:00
James Cole	70c922cdc5	Code cleanup.	2016-01-01 11:32:08 +01:00
James Cole	068fc32cb2	Some query cleaning up.	2015-12-31 20:12:49 +01:00
James Cole	25747fbcf2	And optimised another chart. Amounts are slightly different. Will investigate	2015-12-31 08:31:28 +01:00
James Cole	aac5c2b13c	Optimised another chart.	2015-12-31 08:26:04 +01:00
James Cole	6a9d931ba3	More code cleanup.	2015-12-30 08:21:11 +01:00
James Cole	7cc47ca0b1	Some cleaning up.	2015-12-29 22:48:55 +01:00
James Cole	95f4a83f41	Split category repository into two repositories. One for database calls for single categories, the other pertaining all categories.	2015-12-29 22:44:13 +01:00
James Cole	97727e2e3d	Some code cleanup courtesy of phpstorm.	2015-12-28 07:55:09 +01:00
James Cole	f81e7da8bb	Code cleanup.	2015-12-28 07:49:27 +01:00
James Cole	3bf800be6e	null check.	2015-12-28 07:41:44 +01:00
James Cole	51b45b4ed4	Code cleanup.	2015-12-28 07:12:47 +01:00
James Cole	209116e766	Query optimisations.	2015-12-26 09:21:45 +01:00
James Cole	15fd8cf486	Completed the renaming of some methods.	2015-12-24 10:27:45 +01:00
James Cole	ac61dfae6b	File reformatting.	2015-12-18 16:38:50 +01:00
James Cole	93244c1f78	Fix for left unbalanced field in report.	2015-12-14 12:35:52 +01:00
James Cole	be056cea6b	Update some queries.	2015-12-13 20:41:35 +01:00
James Cole	659ca8be14	Update some queries.	2015-12-13 20:40:41 +01:00
James Cole	ea9af8366d	Update some queries.	2015-12-13 20:39:26 +01:00
James Cole	c4c4fbc34c	Refactor	2015-12-13 10:05:13 +01:00
James Cole	59f57c96e9	Refactor names.	2015-12-13 09:41:22 +01:00
James Cole	a2f852fecf	Clean up code.	2015-12-13 09:35:58 +01:00
James Cole	ad114ed329	Remove unused methods.	2015-12-13 09:30:02 +01:00
James Cole	913e05a2e6	Really, reversed.	2015-12-12 20:20:18 +01:00
James Cole	fa1f703ef6	Some negative sums were failing regarding transfers.	2015-12-12 20:19:40 +01:00
James Cole	4004c53e1b	Fix negative amount thing.	2015-12-12 20:16:30 +01:00
James Cole	4838670649	Transfer fix.	2015-12-12 20:13:07 +01:00
James Cole	a985e09282	Fix query.	2015-12-12 20:10:52 +01:00
James Cole	9bd1503cb4	Expand query to catch all expenses.	2015-12-12 20:07:33 +01:00
James Cole	1423d5b314	Expand query, let's see what happens.	2015-12-12 12:36:36 +01:00
James Cole	9284eb3fe9	First attempt at account specific bill report.	2015-12-12 10:33:19 +01:00
James Cole	2a7085e593	Experimental budget lines. #129	2015-12-12 08:25:08 +01:00
James Cole	2408fb3ed4	Experimental budget lines. #129	2015-12-12 08:24:17 +01:00
James Cole	8316afb176	Experimental budget lines. #129	2015-12-12 08:21:46 +01:00
James Cole	041ca8a5d3	Amount reversal for #129	2015-12-12 08:05:10 +01:00
James Cole	fe4f1b306d	Fix a sum for #129	2015-12-11 18:52:21 +01:00
James Cole	a0972d99fb	Made a negative amount a positive as per #129	2015-12-11 18:49:07 +01:00
James Cole	e332bfef7c	First attempt at budgets (split by account).	2015-12-11 18:45:39 +01:00
James Cole	5aff0c4943	Some fixes for #129	2015-12-11 18:35:49 +01:00
James Cole	938581527e	Fix sorting.	2015-12-11 18:31:15 +01:00
James Cole	c38ae09735	Negative expenses, as per #129	2015-12-11 18:30:28 +01:00
James Cole	28c3cfe084	Fix display of amount. See issue #129	2015-12-11 18:15:37 +01:00
James Cole	4a2823bcba	Reverse sort.	2015-12-11 18:05:07 +01:00
James Cole	18eba02026	Expanded report for categories.	2015-12-11 18:03:13 +01:00
James Cole	d4690ce580	Fix date in budget report	2015-12-11 17:54:52 +01:00
James Cole	a785c450b1	First attempt at including a budget report.	2015-12-11 17:53:17 +01:00
James Cole	7480dc4a19	Fix a query.	2015-12-11 16:39:33 +01:00
James Cole	ad01891a67	First attempt at including expense report.	2015-12-11 16:36:40 +01:00
James Cole	67fe35d564	Small query fix.	2015-12-11 11:32:22 +01:00
James Cole	7f19b6957a	Expanded new report a bit. Mainly copy/paste work. Will have to see how it pans out.	2015-12-11 09:39:17 +01:00
Antonio Spinelli	b3d99cd210	apply demeter law for transaction type calls ... - adds contants for transaction type names - demeter law = never speaks with strangers	2015-12-10 16:53:48 -02:00
James Cole	8f57c7dcb3	Some fixes to amounts.	2015-12-06 13:17:00 +01:00
James Cole	77262f52a4	First functional view of default report.	2015-12-06 13:11:43 +01:00
James Cole	23cdb4d326	Expand month list for new reports.	2015-12-04 06:55:54 +01:00
James Cole	04f71b3b43	Removed old code.	2015-12-02 09:01:40 +01:00
James Cole	d124de51db	Shouldn't be like this?	2015-12-02 09:00:28 +01:00
James Cole	d3682a6727	Another fix in reports.	2015-12-02 08:46:03 +01:00
James Cole	371bbd9508	Some cosmetic fixes to reports	2015-12-02 08:44:23 +01:00
James Cole	37e2f097ba	To make budget report more clear, add spent amount to "spent" column.	2015-12-02 08:35:15 +01:00
James Cole	8a9d576f61	Allow change to default currency. issue #121	2015-11-22 11:30:06 +01:00
James Cole	ebc77540b9	Fix some reports.	2015-10-03 22:49:12 +02:00
James Cole	46aa7f81b2	Fixed a method call.	2015-09-28 20:41:53 +02:00
James Cole	cdc0e3cfd8	Some cleaning up.	2015-09-25 20:40:24 +02:00
James Cole	c3958ed3c4	Fixed some bugs that caused inconsistencies in the monthly reports.	2015-08-29 07:20:53 +02:00
James Cole	e5b88be5fa	Fix a bug where an transfer to and from a shared asset would count as an expense/income.	2015-08-29 06:48:12 +02:00
James Cole	425552988a	Fix month report so transfers from a shared account to another shared account do not count as income.	2015-08-28 06:19:50 +02:00
James Cole	c0d62237fc	Made the date thing throw a FF error.	2015-08-02 08:53:34 +02:00
James Cole	4f0ed97410	Fixed a bug where the category list in a monthly report would be empty.	2015-08-02 07:04:43 +02:00
James Cole	244b90b1d4	Fix bug #98	2015-07-30 21:32:58 +02:00
James Cole	e211c9812e	Fixed some math things.	2015-07-26 19:42:28 +02:00
James Cole	3e05fd91d9	Lots of cleaning up.	2015-07-26 19:07:02 +02:00
James Cole	92799699bc	Better attachment handling.	2015-07-25 18:33:19 +02:00
James Cole	fb722f06b9	Some added newlines.	2015-07-19 09:38:44 +02:00
James Cole	ed4fcc9011	Some optimisation.	2015-07-18 22:17:31 +02:00
James Cole	ed12ea7cfb	Check for double files and some code clean up.	2015-07-18 21:46:16 +02:00
James Cole	cc1af60cb4	Basic attachment download function.	2015-07-18 21:32:31 +02:00
James Cole	6a9574bab9	Allow jpeg and PDF.	2015-07-18 19:49:35 +02:00
James Cole	63ef89b6cc	Basic interface for upload.	2015-07-18 09:49:29 +02:00
James Cole	0a2a01c44c	Code reformat.	2015-07-15 21:06:26 +02:00