390 Commits

Author	SHA1	Message	Date
Kelvin	e300c1aab4	Fix issue with accounts in select map not matching ... When mapping Opposing Accounts the select input's values are incorrect and do not match account ids.	2018-01-06 00:40:17 -05:00
James Cole	9e1586878b	Test some preprocessors.	2018-01-05 17:51:05 +01:00
James Cole	3e9f98b43e	Expand test coverage.	2018-01-05 17:29:42 +01:00
James Cole	d3cad66b69	Improve tests for import.	2018-01-05 07:41:26 +01:00
James Cole	e7debc5466	Rewrote importer to be more clean about the stage it is in.	2018-01-04 19:33:16 +01:00
James Cole	5866300ac1	Rename and move some files.	2018-01-04 18:34:51 +01:00
James Cole	6b59b6de6e	Fix some things in import routine.	2018-01-04 08:59:39 +01:00
James Cole	5177619301	Lots of new code for Spectre import.	2018-01-03 19:17:30 +01:00
James Cole	4e0319bacc	Fix for #1092	2018-01-03 07:35:29 +01:00
James Cole	3f786856f3	Expand code for Spectre login.	2018-01-02 15:17:31 +01:00
James Cole	6713597621	Fix #1087	2018-01-02 06:39:34 +01:00
James Cole	3815f9836f	Various code cleanup.	2017-12-29 09:05:35 +01:00
James Cole	67cc03e4dd	More code for spectre.	2017-12-28 18:39:30 +01:00
James Cole	a10672a683	Progress for Spectre import.	2017-12-28 18:38:59 +01:00
James Cole	0977d8d631	Fix #1070	2017-12-28 18:28:22 +01:00
James Cole	97cde38d8f	Create logins.	2017-12-27 18:34:03 +01:00
James Cole	a14ae02c27	Expand Spectre code.	2017-12-27 17:22:44 +01:00
James Cole	8bd76d1ff0	Various code cleanup.	2017-12-22 18:32:43 +01:00
James Cole	707af8bb4e	Code for #1045	2017-12-21 19:18:53 +01:00
James Cole	840705f793	No need to unset non-existing variable #1059	2017-12-21 07:59:22 +01:00
James Cole	46f894c09b	Fix #1059	2017-12-19 21:54:15 +01:00
James Cole	a69aad878e	Fix #1056	2017-12-19 19:25:50 +01:00
James Cole	e21e339cb0	Fix some spelling errors.	2017-12-19 18:53:50 +01:00
James Cole	34fc9bc50a	Fix Spectre, first code to create customer.	2017-12-19 05:20:37 +01:00
James Cole	1f6e42afd9	Update copyright [skip ci]	2017-12-17 14:44:05 +01:00
James Cole	ff9ad859b3	Update copyright [skip ci]	2017-12-17 14:41:58 +01:00
James Cole	78335e5814	Expand tests, do code cleanup.	2017-12-17 14:30:53 +01:00
James Cole	7d348f25ac	Expand import routine to work over command line.	2017-12-16 20:47:08 +01:00
James Cole	22535c0e43	Last steps for import, in user interface.	2017-12-16 20:21:05 +01:00
James Cole	8176356509	New code for import routine, part 3	2017-12-16 19:47:14 +01:00
James Cole	9086259a65	Small code change for controllers.	2017-12-16 19:46:36 +01:00
James Cole	66ee382da0	Lots of new code for the import routine part 2	2017-12-16 17:19:10 +01:00
James Cole	84b6708260	Massive rewrite for import routine, part 1.	2017-12-16 08:03:35 +01:00
James Cole	9264f1e9b9	Fix #1051	2017-12-13 17:09:55 +01:00
James Cole	fc4165b800	Make sure new CSV reader is compatible with specifics #1015	2017-12-12 21:05:16 +01:00
James Cole	bad889d450	Update ING description for #1015	2017-12-12 20:53:16 +01:00
James Cole	fd7a293f4b	Merge branch 'spectre' into develop ... * spectre: Fix encryption. Can handle some mandatory fields (not all). More code for Spectre import. Initial code to get providers from Spectre. Exceptions when class does not exist.	2017-12-11 14:53:01 +01:00
James Cole	089214709f	Remove wrong copyright blocks [skip ci]	2017-12-10 08:56:11 +01:00
James Cole	2365fb69b4	Can handle some mandatory fields (not all).	2017-12-09 20:02:26 +01:00
James Cole	e488d7d84c	More code for Spectre import.	2017-12-09 19:13:00 +01:00
James Cole	8a59380c6d	First set of code for #956	2017-12-01 20:11:29 +01:00
James Cole	7852f4df1f	Expand test coverage.	2017-11-26 09:54:09 +01:00
James Cole	781ca052d8	Code cleanup.	2017-11-22 21:12:27 +01:00
James Cole	4e6b782204	Fix tests.	2017-11-22 20:30:23 +01:00
James Cole	69bb76b6fe	Update code for reconciliation.	2017-11-22 16:54:49 +01:00
James Cole	cd42399c29	Fix #931	2017-11-18 20:26:42 +01:00
James Cole	63d93968d0	Fix tests.	2017-11-15 15:30:15 +01:00
James Cole	ffca858b8d	Code clean up.	2017-11-15 12:25:49 +01:00
James Cole	57dcdfa0c4	Code clean up.	2017-11-15 11:33:07 +01:00
James Cole	649dca77f5	Code clean up.	2017-11-15 10:52:29 +01:00
James Cole	8f57222098	fix for #988	2017-11-08 16:04:55 +01:00
James Cole	d2ab03061f	Various code cleanup.	2017-11-05 19:49:20 +01:00
James Cole	1a325f4978	Some code cleanup.	2017-10-22 20:13:02 +02:00
James Cole	ac461d64a8	New copyright notice.	2017-10-21 08:40:00 +02:00
Hugo van Duijn	a1e2814990	Added SNS specifics code for removing quotes from description	2017-10-05 16:00:03 +02:00
James Cole	e68594a93b	Various code cleanup.	2017-10-05 11:49:06 +02:00
James Cole	6770b8396a	Fix sprintf error #893	2017-10-04 14:58:03 +02:00
James Cole	35a5310485	Fix #893	2017-10-04 07:19:19 +02:00
James Cole	d1a6b37eb3	Use note object instead of field #888	2017-10-03 10:30:56 +02:00
James Cole	2dfe2ddaf3	Attempt to cover all cases in amount converter, this fixes #840	2017-10-02 16:25:48 +02:00
James Cole	134f21bada	Fix for #825	2017-09-30 13:16:12 +02:00
James Cole	40f2659b91	Smooth error catching.	2017-09-29 15:32:47 +02:00
James Cole	e442eb6ce2	Update Amount.php ... Fix null pointer #854	2017-09-20 08:31:00 +02:00
James Cole	db9c0600a8	Update ImportStorage.php ... Fix for #854	2017-09-19 07:51:16 +02:00
James Cole	3f93941dd9	Fix #854	2017-09-17 19:21:03 +02:00
James Cole	b1135cee60	Various code cleanup	2017-09-16 07:17:58 +02:00
James Cole	38bb074751	Fix storage bug in #845	2017-09-15 06:26:09 +02:00
James Cole	f4938cfed7	Debug text in import routine.	2017-09-14 18:10:31 +02:00
James Cole	233305ecb4	Change namespace of rules.	2017-09-13 07:49:58 +02:00
James Cole	66c13f35e7	Various code cleanup.	2017-09-09 07:03:43 +02:00
James Cole	2dff8aec69	Code for #819	2017-09-08 20:24:11 +02:00
James Cole	068b9e388f	New code for double transfer routine. #797	2017-09-05 06:43:33 +02:00
James Cole	f2446d46aa	Code for #797	2017-09-03 18:19:58 +02:00
James Cole	78c8680300	Expand log for #797	2017-09-03 18:18:19 +02:00
James Cole	0444ad5221	Debug message for #797	2017-09-03 13:02:19 +02:00
James Cole	693c6fb71b	Debug message for #797	2017-09-03 13:00:36 +02:00
James Cole	8dec769d64	Add newlines to files [skip ci]	2017-08-31 06:47:18 +02:00
James Cole	6666d1a2f4	Add debug information to getAmount routine.	2017-08-15 21:12:49 +02:00
James Cole	1633994fbd	Slight change in amount handler. #760	2017-08-13 15:30:39 +02:00
James Cole	f9c85d4d81	Catch the error in #760	2017-08-13 12:37:09 +02:00
James Cole	f9b5468481	Last minute fixes for import routine.	2017-08-13 08:49:45 +02:00
James Cole	26740668da	Import transfer error	2017-08-12 21:23:19 +02:00
James Cole	ad4a811d0a	Small bug fixes [skip ci]	2017-08-12 19:11:24 +02:00
James Cole	018941c5b3	Actually use journal [skip ci]	2017-08-12 19:05:29 +02:00
James Cole	cc1439fb7b	Revamped import routine.	2017-08-12 19:03:42 +02:00
James Cole	f684a2900b	Include default currency.	2017-08-12 16:42:29 +02:00
James Cole	a879528ed8	Back to basics.	2017-08-12 16:40:51 +02:00
James Cole	accbff3ccb	Small cleanup in CSV processor	2017-08-12 16:12:30 +02:00
James Cole	0375f77b73	Prevent asset account from being found by opposing account. #719	2017-08-12 13:49:40 +02:00
James Cole	9803932324	Various code clean up.	2017-08-12 10:27:45 +02:00
James Cole	743547096e	Various code cleanup	2017-08-12 07:47:42 +02:00
James Cole	12624cab5b	Improve foreign currency routine for #746	2017-08-12 07:38:22 +02:00
James Cole	31de86c9eb	Improve error reporting #752	2017-08-12 06:40:17 +02:00
James Cole	1cfa1faccc	Remove all time jumps because they’re unclear and complex.	2017-07-30 13:53:04 +02:00
James Cole	db3b822aef	Include warning for #722	2017-07-29 08:27:39 +02:00
James Cole	f4994ef151	Also store links when importing data.	2017-07-28 14:52:01 +02:00
James Cole	f85ab74e2b	Code cleanup and tests.	2017-07-23 08:32:51 +02:00
James Cole	8bb7d5de3f	Various code clean up.	2017-07-23 08:16:11 +02:00
James Cole	b676b1fef9	Simplify import storage routine.	2017-07-16 07:45:20 +02:00
James Cole	22144b78ea	Strict comparisons.	2017-07-15 16:41:07 +02:00
James Cole	c03ab269f0	Memory optimised, connect journal to tag.	2017-07-15 10:43:22 +02:00
James Cole	e4e1873770	Improve import routine.	2017-07-15 10:26:16 +02:00
James Cole	3b3579025d	Improve results when presented with invalid data. #701	2017-07-14 17:57:20 +02:00
James Cole	3c4abb7b60	Fixed some issues in import, should improve results for #701	2017-07-14 06:41:47 +02:00
James Cole	9b6ccdd43a	Fixes #694	2017-07-10 19:52:31 +02:00
James Cole	952328d55c	Routine to make sure imported entries have the correct opposing account and the correct amount.	2017-07-08 06:53:06 +02:00
James Cole	69eef30ad3	Various code clean up.	2017-07-07 13:50:15 +02:00
James Cole	71a41bc00d	Add newlines [skip ci]	2017-07-07 08:09:42 +02:00
James Cole	dd508dbc49	This should fix #693.	2017-07-07 08:04:21 +02:00
James Cole	dc5bd648cf	Fix for #685	2017-07-02 08:43:34 +02:00
James Cole	02a36316be	Forgot to remove a variable.	2017-06-26 18:24:44 +02:00
James Cole	04a8a0e6a1	Code clean up	2017-06-24 13:04:41 +02:00
James Cole	5fbc319b20	This fixes the tests (must still upload test database).	2017-06-24 12:38:24 +02:00
James Cole	8e3ba7caf2	Fix various import bugs.	2017-06-24 08:37:09 +02:00
James Cole	da3a56c144	Further improve import storage.	2017-06-24 07:30:05 +02:00
James Cole	58aa54d8cf	Improving import storage.	2017-06-24 07:21:10 +02:00
James Cole	e525e673a8	Import routine cleanup.	2017-06-24 06:57:24 +02:00
James Cole	445dbf8779	More and improved code for the import routine.	2017-06-24 05:49:33 +02:00
James Cole	edb355941c	More code for import routine.	2017-06-22 21:50:10 +02:00
James Cole	cddaccb7f7	Further improve import routine	2017-06-21 20:04:35 +02:00
James Cole	a905cce2c9	Expand import routine.	2017-06-20 21:04:25 +02:00
James Cole	b9f110ac2b	Refactor and rename some import things.	2017-06-17 22:49:44 +02:00
James Cole	7cc24417b3	Expanded import routine.	2017-06-14 20:13:19 +02:00
James Cole	77244f4e2c	Lots of new code for new importer routine.	2017-06-12 19:12:07 +02:00
James Cole	c79a577060	Remove unused files in import.	2017-06-10 15:10:46 +02:00
James Cole	091596e80e	Lots of new code for new importer routine.	2017-06-10 15:09:41 +02:00
James Cole	1f9b7faa60	Code for #660	2017-06-09 11:52:20 +02:00
James Cole	8bbd3063ec	Move code around for simplicity and fix tests.	2017-06-07 11:13:04 +02:00
James Cole	c4039b53e6	Various code cleanup.	2017-06-05 11:12:50 +02:00
James Cole	82e74a2afd	Big update to properly support multi currencies.	2017-06-04 13:39:16 +02:00
James Cole	595596d73f	Apparently this is changed in PHPStorm’s formatting templates so there you go [skip ci].	2017-04-09 07:44:22 +02:00
James Cole	1fb0a64f31	Various code cleanup [skip ci]	2017-03-24 15:15:12 +01:00
James Cole	8c6972d12d	Various code cleanup.	2017-02-25 05:57:01 +01:00
James Cole	5d0cdc4ffa	Various code cleanup.	2017-02-17 06:42:36 +01:00
James Cole	636b371b86	Fixes #553	2017-02-15 16:20:16 +01:00
James Cole	cf2cd9680b	This fixes #569	2017-02-15 15:18:52 +01:00
James Cole	4c2d9e0eee	Small code cleanup.	2017-02-11 15:52:55 +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	ac86e75233	Updated various files for #506	2016-12-30 13:45:02 +01:00
James Cole	82718a74dc	Fix tests	2016-12-25 12:55:22 +01:00
James Cole	b6aa79bb38	Various code cleanup. Removed executable flags, added newlines.	2016-12-22 19:42:45 +01:00
James Cole	14a0de6b6a	This should fix account-number.	2016-12-22 19:18:35 +01:00
James Cole	13e56b7249	Can handle account number, but do nothing with it.	2016-12-22 19:17:33 +01:00
James Cole	46c26a64d8	Update import storage routine for issue #483, as suggested by @zjean	2016-12-21 17:21:36 +01:00
James Cole	7ecd691ee2	New tests.	2016-12-17 19:19:49 +01:00
James Cole	f3398c7dec	This fixes #472	2016-12-17 17:09:46 +01:00
James Cole	848cfabcba	Rearrange code [skip ci]	2016-12-14 18:59:12 +01:00
James Cole	a1cef5c339	Found a bug in the import routine where "default accounts" (an account type no longer used by default) is found.	2016-11-20 11:44:27 +01:00
James Cole	94875adb6c	Various code cleanup.	2016-11-20 11:43:19 +01:00
James Cole	75a524c656	Added debug code for a possible import issue.	2016-11-20 11:40:05 +01:00
James Cole	da49afa37b	Removed duplicate code.	2016-11-12 19:12:16 +01:00
James Cole	7821c52842	Ajax some report parts.	2016-10-30 18:29:26 +01:00
James Cole	e092515dff	Better export.	2016-10-23 12:55:07 +02:00
James Cole	81f6fef978	Add new line to files [skip ci]	2016-10-23 12:42:44 +02:00
James Cole	d92768ecbf	This code fixes #349	2016-10-20 19:10:43 +02:00
James Cole	3598780d54	This should at least catch #357	2016-10-14 19:18:00 +02:00
James Cole	23fad62d46	Completely removed account crud class.	2016-10-10 08:03:03 +02:00
James Cole	de6f838413	Moved getAccountsByType	2016-10-10 07:49:39 +02:00
James Cole	717c1d080e	Copied (not yet removed) findByName	2016-10-10 07:20:49 +02:00
James Cole	0ae9afd325	Move findByIban	2016-10-10 07:16:05 +02:00
James Cole	d1b56c2afa	Moved findByAccountNumber	2016-10-10 07:14:01 +02:00
James Cole	8ef7c5ac33	Moved find() method to new class.	2016-10-10 07:12:39 +02:00
Robert Horlings	ee9a5d91e2	Merge branch 'develop' into bugfix/abn-amro-specific	2016-10-09 19:53:11 +02:00
Robert Horlings	171ab8a4c3	Fixed issue causing all imported transactions to have unknown opposing account with ABN AMRO specific	2016-10-09 17:19:00 +02:00
James Cole	c64771b76b	Move some methods around, refactoring.	2016-10-09 07:58:27 +02:00
James Cole	49af6522a8	Some code cleanup.	2016-10-07 05:44:21 +02:00
Sander Kleykens	cf543613c9	Fix the CSV importer failing when using PostgreSQL ... Add ordered column to the list of columns that are selected so PostgreSQL doesn't throw an error	2016-10-06 23:49:33 +02:00
James Cole	b355c18e0c	Some code cleanup and copyright cleanup. [skip ci]	2016-10-05 06:52:15 +02:00
James Cole	724d25f2c2	Merge branch 'develop' ... * develop: Fixed some rare bugs. Extra clear button to reapply rules #307 Fix trim when null [skip ci] Fixed a bug where incoming transactions would not be properly filtered in several reports. Removed for #334 Fix #337 [skip ci] Fix #335 Remove account extra text #336 [skip ci] Fixes bug #338 Refer to correct page [skip ci] Catch unset row.	2016-10-04 20:08:35 +02:00
Tom van der Werf	d7fef45a56	added some comments	2016-10-04 17:50:01 +00:00
Tom van der Werf	dc22802dec	removed some debug commands	2016-10-04 17:30:49 +00:00
Tom van der Werf	ce5af7b1d9	Better descriptions for ING accounts	2016-10-03 17:08:24 +00:00
James Cole	0a147e5c9c	Fixed some rare bugs.	2016-10-02 15:09:43 +02:00
James Cole	dbb5cdb9cf	Catch unset row.	2016-09-29 07:02:47 +02:00
James Cole	e4e0e21293	Smaller method.	2016-09-25 08:59:27 +02:00
James Cole	15089f0d7e	Some issues fixed for scrutiniser.	2016-09-25 08:50:12 +02:00
James Cole	7232c1d7bb	partial fix for #307	2016-09-25 08:46:57 +02:00
James Cole	9a53d8c21c	Some array_keys fixes.	2016-09-25 08:46:42 +02:00
James Cole	45bc23b8af	Some issues fixed for scrutiniser.	2016-09-25 08:32:53 +02:00
James Cole	bb7c26b77c	Some issues fixed for scrutiniser.	2016-09-25 08:20:17 +02:00
James Cole	ad2b254be0	Fix for issue #328. Turns out the import routine converts accounts back and forth instead of creating new entries.	2016-09-24 18:59:31 +02:00
James Cole	1357352276	Merge pull request #320 from Mortalife/master ... Decimal place fix on import	2016-09-20 20:21:02 +02:00
Matthew Peck	70bb85a75b	Cleanup	2016-09-20 00:00:11 +01:00
Matthew Peck	8cd901b57b	Added support for multiple decimal places	2016-09-19 23:53:51 +01:00
James Cole	a95099fa46	Update FF configuration.	2016-09-18 19:57:21 +02:00
James Cole	5ca9099654	Some code fixes.	2016-09-17 09:50:40 +02:00
James Cole	6958f71cfd	@fuf discovered a bug where FF3 will fall back to the hard-coded system default currency and not the set default currency. See #307	2016-09-13 19:19:58 +02:00
James Cole	e4fef6dfc3	Fixed an import bug where a new transaction validation rule would break storing of the transaction, while the import would not notice this error happening. The importer will now also correctly set a date on the "import tag" and will not tag an incomplete journal as already imported. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-11 08:08:01 +02:00
Bonno Nachtegaal-Karels	3285fae7f0	Fixed wrong conversion to revenue account	2016-08-29 14:39:43 +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	6490a4240d	Remove references to ImportResult. Add the application of user rules. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-26 07:37:47 +02:00
James Cole	7079e76886	Remove some commented code. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-26 07:36:33 +02:00
James Cole	ff3396e286	Removed the ImportResult class because it was lame. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-26 07:36:13 +02:00
James Cole	78912903ce	Change signature of importstorage.	2016-08-26 06:47:12 +02:00
James Cole	172634a55a	Add some comments.	2016-08-26 06:43:38 +02:00
James Cole	58ca7d551a	Rename import procedure method name	2016-08-26 06:43:23 +02:00
James Cole	98c4ac955a	Finetune user feedback during import and add a tag to collect transactions.	2016-08-14 11:31:09 +02:00
James Cole	106665a468	Better reporting for double imported rows. See also #164	2016-08-14 09:49:04 +02:00