Commit Graph

818 Commits

Author SHA1 Message Date
Tom Bloor e495f744d9
Merge pull request #127 from Pear-Trading/master
Master merge for v0.10.10
2019-09-24 11:57:51 +01:00
Tom Bloor 48f8f20202
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 d9673f32e3
Update perl version in Travis CI 2019-09-16 10:46:38 +01:00
Thomas Bloor 5149121e11
Update changelog 2019-09-16 10:43:44 +01:00
Thomas Bloor 0d323c985f
Merge branch 'TBSliver/NewGraphs' into development 2019-09-16 10:41:06 +01:00
Finn ff04f44232 flash fixes on import 2019-09-11 15:02:08 +01:00
Finn fdbe86a464 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 acad46a9b5
need to check headers first 2019-09-10 09:32:15 +01:00
Thomas Bloor 9299c46fdf
reduce memory usage importing CSV files 2019-09-10 09:29:17 +01:00
Thomas Bloor 1efabeb45e
fix a few bugs, oops 2019-09-09 19:48:16 +01:00
Thomas Bloor 103cf61ec6
filter everything by date 2019-09-09 19:32:14 +01:00
Thomas Bloor 653f495a70
added search on supplier listings 2019-09-09 18:03:08 +01:00
Thomas Bloor eabc4e04fb
Merge remote-tracking branch 'origin/finn/postcodeimport' into TBSliver/NewGraphs 2019-09-09 16:53:44 +01:00
Thomas Bloor f89572e3de
oops still using wrong column name 2019-09-09 16:44:05 +01:00
Thomas Bloor d484b342df
fix transaction list in admin and speed up external count 2019-09-09 16:42:49 +01:00
Finn 916e77a238 Added type name filter to show data better on frontend 2019-09-09 16:24:07 +01:00
Thomas Bloor 962cf972da
Hopefully fix speed issue on external data 2019-09-09 15:37:56 +01:00
Finn 3b8b5b97f4 Added extra data showing 2019-09-06 17:31:09 +01:00
Finn af9069b17a
added ability to import sheets with extra data 2019-09-02 15:34:28 +01:00
Finn c977cf3279
added importing doogal data for wards on postcode 2019-08-29 16:37:55 +01:00
Felix 9b7d8530b6 Revert "custom graph duration and dateRange added"
This reverts commit bbb7edd269.
2019-08-14 14:02:01 +01:00
Felix bbb7edd269 custom graph duration and dateRange added
(untested)
2019-08-14 14:00:34 +01:00
Tom Bloor 0328bdc1f6
Fix import ref 2019-07-15 12:36:28 +01:00
Tom Bloor b1ab789455
Added search ref option 2019-07-15 10:11:59 +01:00
Tom Bloor 51f0fb406e
Allow for per page setting for supplier list 2019-07-15 10:03:44 +01:00
Tom Bloor 5accf45cde
And then called them against the right table 2019-07-15 05:34:11 +01:00
Tom Bloor 7dc7acb1a1
Turns out I wrote three queries 2019-07-15 04:54:55 +01:00
Tom Bloor 86d52e7bbc
Group by the right thing this time 2019-07-15 04:52:55 +01:00
Tom Bloor 43808f5510
Fix some annoyances with joins 2019-07-15 04:50:46 +01:00
Tom Bloor ed2b6970f4
Supplier history view 2019-07-15 04:45:57 +01:00
Tom Bloor 9357405445
Make value actually nnot be stupid 2019-07-15 04:28:44 +01:00
Tom Bloor b02f8b7c5f
This should have fixed a few issues... need to speed things up though 2019-07-15 04:25:51 +01:00
Tom Bloor 4fdff21f50
Change to using a name map temporarily 2019-07-15 03:45:42 +01:00
Tom Bloor 546193f0cb
Updated view with actual column spec 2019-07-15 02:48:49 +01:00
Tom Bloor 314c3e4bd5
More graph niceness 2019-07-15 02:41:23 +01:00
Tom Bloor 135fd890b2
use the correct column name 2019-07-15 01:55:02 +01:00
Tom Bloor 06b08cff07
Add new year spend graph 2019-07-15 01:33:07 +01:00
Tom Bloor 4d3aca2457
remove unused order by 2019-07-14 19:43:09 +01:00
Tom Bloor d661ab5996
Another possible fix for transactions under postgres 2019-07-14 19:41:02 +01:00
Tom Bloor 00dbb77130
Possible fix for transactions under postgres 2019-07-14 18:47:48 +01:00
Tom Bloor 330a4a93ed
Merge pull request #125 from Pear-Trading/TBSliver/MinionImport
Minion Import
2019-07-14 16:21:52 +01:00
Tom Bloor 39aa2d2083
Fix meta transaction undef error 2019-07-14 16:05:35 +01:00
Tom Bloor 7d862290d3
Possible fix for test failure 2019-07-14 15:52:39 +01:00
Tom Bloor 71189d18fc
Fix various bits for import 2019-07-14 15:15:14 +01:00
Finn a45c354834
Added entity postcode lookup 2019-07-12 21:30:34 +01:00
Finn cc84dbb76e
Added meta data to transactions 2019-07-12 20:46:39 +01:00
Finn 536d11f298
Fully working supplier list 2019-07-12 20:04:38 +01:00
Finn f6ed82a02f
Added API for supplier table 2019-07-12 18:51:38 +01:00
Finn 6ecc3d3c56
fixed snippets test 2019-07-12 17:16:19 +01:00
Finn 94aced117d
updated git ignore and commented out currently redundant code 2019-07-12 17:07:42 +01:00