Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,574 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

1059 Commits

Author SHA1 Message Date
wvengen a699f95903 fix fax documents for stock orders (closes foodcoops#79) 2014-09-02 15:47:01 +02:00
wvengen 1a3b690757 add custom css to config screen 2014-09-02 15:02:26 +02:00
wvengen cf680d3410 add page break to config screen 2014-09-02 15:02:26 +02:00
wvengen 0f7dc37015 fix config value override 
Conflicts:
	app/helpers/admin/configs_helper.rb
 2014-09-02 15:02:25 +02:00
wvengen 68ccc19c70 allow to configure currency (closes foodcoops#258) 2014-09-02 15:02:25 +02:00
wvengen 3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +02:00
wvengen 6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen 9beaac2627 allow to specify (un)checked values for config boolean 
Conflicts:
	app/helpers/admin/configs_helper.rb
 2014-09-02 14:21:32 +02:00
wvengen 429e111db4 hide protected keys from config 2014-09-02 14:21:32 +02:00
wvengen 7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen b5ddbcae21 make custom css more robust 2014-09-02 14:15:59 +02:00
wvengen 97dc090e4d Merge pull request #306 from wvengen/feature-styling 
allow foodcoops to add custom css
 2014-09-02 13:59:18 +02:00
wvengen 19630e8607 allow foodcoops to add custom css 2014-09-02 13:35:45 +02:00
wvengen 8473f16091 query performance improvements 2014-09-02 12:58:32 +02:00
wvengen 647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen 3918e22214 synchronize price on two decimal places only 2014-09-02 12:58:31 +02:00
wvengen d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen 16b78ba2a0 fix shared import paging without query 2014-09-02 12:58:31 +02:00
wvengen d906a7342f workaround receive error with many articles 2014-09-02 12:35:57 +02:00
wvengen 63d52db91b more sensible mailer option defaults 
Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml
 2014-09-02 12:35:57 +02:00
wvengen ecf5601023 make missing_units get correct details for closed orders 2014-09-01 12:25:42 +02:00
wvengen 0b08d461fa remove html escaping from all text mails 2014-09-01 11:08:32 +02:00
wvengen 8913ad615c show articles ordered by members but not by foodcoop dimmed in receive 2014-08-29 12:23:23 +02:00
wvengen e61c3c9267 order articles by number then name in fax+receive 
This makes it easier to enter the receive screen from an order pdf print
with received amounts.

Conflicts:
	app/documents/order_fax.rb
 2014-08-19 09:19:01 +02:00
wvengen d8f4ac47dd handle ajax errors (closes foodcoops#300) 2014-07-02 13:55:05 +02:00
wvengen fa725dbf38 fix csv download also when searching 2014-07-02 09:37:03 +02:00
wvengen c80a9cd68b fix csv download (closes foodcoop-adam#129) 2014-07-01 11:14:35 +02:00
wvengen 59ab628e2f fix layout bug 2014-06-23 17:51:20 +02:00
wvengen 873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen 6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen b112028935 fix invititation form 
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
 2014-06-23 17:51:19 +02:00
wvengen 4b6231129c only show undeleted articles in receive screen 2014-06-23 17:51:19 +02:00
wvengen 9e58a6f2b1 fix csv download + template optional parameters 
Conflicts:
	app/views/finance/financial_transactions/_transactions.html.haml
	app/views/home/ordergroup.html.haml
	app/views/login/_accept_invitation_form.html.haml
 2014-06-23 17:51:19 +02:00
wvengen a43020463d normalize article and category attributes (closes foodcoops#294) 2014-06-23 17:51:19 +02:00
wvengen 7c2ecd8658 add some model api docs 2014-06-23 17:51:19 +02:00
wvengen 2bf13dbefa give partially unused order articles a distinct colour 2014-06-23 17:51:19 +02:00
wvengen fee0cfbdc7 make orders helpers clearer 2014-06-23 17:51:19 +02:00
wvengen e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen 2a6e0e0460 fix asset url in css (unbreaks heroku image 404) 2014-06-23 17:51:18 +02:00
wvengen 86a5576dc3 fix delete order confirmation 2014-06-23 17:51:18 +02:00
wvengen c64a7ba3cd validate date and time inputs 2014-06-23 17:51:18 +02:00
wvengen 8c0df3b4e8 edit order user-interface update 
also closes foodcoops#145
 2014-06-23 17:51:18 +02:00
wvengen ef0888f38d add view for all transactions + csv 2014-06-23 17:51:17 +02:00
wvengen b5b4ccd922 make data-submit-onchange work with datepicker 2014-06-23 17:51:17 +02:00
wvengen 7b51f7aabe fix negative balance email 2014-05-30 10:22:47 +02:00
wvengen 71a922a034 use locale in mails 
Conflicts:
	app/workers/supplier_notifier.rb
	app/workers/user_notifier.rb
 2014-05-13 17:01:28 +02:00
wvengen 5d9c9856d1 show proper error when all articles are deselected in order edit 2014-05-13 17:01:27 +02:00
wvengen 4c1e5e2b00 fix default textarea height 2014-05-13 17:01:27 +02:00
wvengen 3a41e9530f fix order bug 2014-05-13 17:01:27 +02:00
wvengen 3953c21ae2 use capture instead of layout-hack to allow deface overrides 2014-05-13 17:01:27 +02:00