Commit graph

818 commits

Author SHA1 Message Date
Tom Bloor
de3def3b5e Merge pull request #127 from Pear-Trading/master
Master merge for v0.10.10
2019-09-24 11:57:51 +01:00
Tom Bloor
95ff10f05f Merge pull request #126 from Pear-Trading/Release-v0.10.10
Release v0.10.10
2019-09-16 11:08:08 +01:00
Thomas Bloor
558e7e1c42 Update perl version in Travis CI 2019-09-16 10:46:38 +01:00
Thomas Bloor
211c6a4c3e Update changelog 2019-09-16 10:43:44 +01:00
Thomas Bloor
6ae30b150b Merge branch 'TBSliver/NewGraphs' into development 2019-09-16 10:41:06 +01:00
Finn
f33100ba87 flash fixes on import 2019-09-11 15:02:08 +01:00
Finn
c9e272e380 made changes to CSV import to improve memory usage
uses same mechanism as postcode import code change does
2019-09-11 14:19:12 +01:00
Thomas Bloor
1075f59086 need to check headers first 2019-09-10 09:32:15 +01:00
Thomas Bloor
b3139c3bf0 reduce memory usage importing CSV files 2019-09-10 09:29:17 +01:00
Thomas Bloor
19b4530810 fix a few bugs, oops 2019-09-09 19:48:16 +01:00
Thomas Bloor
e3a3c1cc91 filter everything by date 2019-09-09 19:32:14 +01:00
Thomas Bloor
f7b4fd251e added search on supplier listings 2019-09-09 18:03:08 +01:00
Thomas Bloor
81530e227a Merge remote-tracking branch 'origin/finn/postcodeimport' into TBSliver/NewGraphs 2019-09-09 16:53:44 +01:00
Thomas Bloor
cd8204a759 oops still using wrong column name 2019-09-09 16:44:05 +01:00
Thomas Bloor
93191c10d2 fix transaction list in admin and speed up external count 2019-09-09 16:42:49 +01:00
Finn
0332b8bdb2 Added type name filter to show data better on frontend 2019-09-09 16:24:07 +01:00
Thomas Bloor
e8c45d75c4 Hopefully fix speed issue on external data 2019-09-09 15:37:56 +01:00
Finn
c65745f6a2 Added extra data showing 2019-09-06 17:31:09 +01:00
Finn
d20fca6732 added ability to import sheets with extra data 2019-09-02 15:34:28 +01:00
Finn
e04b1a51b6 added importing doogal data for wards on postcode 2019-08-29 16:37:55 +01:00
Felix
0f13d7528e Revert "custom graph duration and dateRange added"
This reverts commit bbb7edd269.
2019-08-14 14:02:01 +01:00
Felix
4a1fe64711 custom graph duration and dateRange added
(untested)
2019-08-14 14:00:34 +01:00
Tom Bloor
461dd88691 Fix import ref 2019-07-15 12:36:28 +01:00
Tom Bloor
9aa52036a2 Added search ref option 2019-07-15 10:11:59 +01:00
Tom Bloor
e59322cbaa Allow for per page setting for supplier list 2019-07-15 10:03:44 +01:00
Tom Bloor
64fb64385d And then called them against the right table 2019-07-15 05:34:11 +01:00
Tom Bloor
a0f16725b2 Turns out I wrote three queries 2019-07-15 04:54:55 +01:00
Tom Bloor
a84201305d Group by the right thing this time 2019-07-15 04:52:55 +01:00
Tom Bloor
d3933f53af Fix some annoyances with joins 2019-07-15 04:50:46 +01:00
Tom Bloor
c6e8c87f28 Supplier history view 2019-07-15 04:45:57 +01:00
Tom Bloor
840e7489db Make value actually nnot be stupid 2019-07-15 04:28:44 +01:00
Tom Bloor
6caae3685a This should have fixed a few issues... need to speed things up though 2019-07-15 04:25:51 +01:00
Tom Bloor
34f9090a47 Change to using a name map temporarily 2019-07-15 03:45:42 +01:00
Tom Bloor
ff999c0a62 Updated view with actual column spec 2019-07-15 02:48:49 +01:00
Tom Bloor
d740846f48 More graph niceness 2019-07-15 02:41:23 +01:00
Tom Bloor
932af83ca5 use the correct column name 2019-07-15 01:55:02 +01:00
Tom Bloor
41b7c24544 Add new year spend graph 2019-07-15 01:33:07 +01:00
Tom Bloor
0e99a9bf94 remove unused order by 2019-07-14 19:43:09 +01:00
Tom Bloor
f61c90a3c0 Another possible fix for transactions under postgres 2019-07-14 19:41:02 +01:00
Tom Bloor
ed0a14c468 Possible fix for transactions under postgres 2019-07-14 18:47:48 +01:00
Tom Bloor
afc984a682 Merge pull request #125 from Pear-Trading/TBSliver/MinionImport
Minion Import
2019-07-14 16:21:52 +01:00
Tom Bloor
451f6993ce Fix meta transaction undef error 2019-07-14 16:05:35 +01:00
Tom Bloor
64902bf1e1 Possible fix for test failure 2019-07-14 15:52:39 +01:00
Tom Bloor
a29c09c9bf Fix various bits for import 2019-07-14 15:15:14 +01:00
Finn
697c1494b0 Added entity postcode lookup 2019-07-12 21:30:34 +01:00
Finn
04a8186b2a Added meta data to transactions 2019-07-12 20:46:39 +01:00
Finn
22b86ca21d Fully working supplier list 2019-07-12 20:04:38 +01:00
Finn
5525479e27 Added API for supplier table 2019-07-12 18:51:38 +01:00
Finn
dc6c6541d7 fixed snippets test 2019-07-12 17:16:19 +01:00
Finn
1eb151d827 updated git ignore and commented out currently redundant code 2019-07-12 17:07:42 +01:00