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

377 Commits

Author SHA1 Message Date
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 647b7f0430 allow to synchronize all articles of a shared supplier 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 d906a7342f workaround receive error with many articles 2014-09-02 12:35:57 +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 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 5d9c9856d1 show proper error when all articles are deselected in order edit 2014-05-13 17:01:27 +02:00
wvengen 64bb8e043d enable/disable plugins by config option 2014-05-13 17:01:26 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen 48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +02:00
wvengen f71b78665e allow 500 items per page 2014-05-13 17:01:24 +02:00
wvengen 0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00
wvengen 0014435663 improved shared database import ui 2014-05-13 17:01:24 +02:00
wvengen 8853b3efdb fix sort order 2014-03-08 17:15:09 +01:00
wvengen d9326dd984 allow plugins to override login redirection when authentication failed 2014-02-25 10:18:14 +01:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen 
Conflicts:
	app/assets/javascripts/application.js
 2014-02-10 16:03:08 +01:00
wvengen 2de4a2a3a0 Merge pull request #256 from wvengen/feature-partial_shared_sync 
Small change to allow non-shared articles with shared suppliers
 2014-02-07 11:24:33 +01:00
wvengen 3e79304c5a typo 2014-01-27 14:58:39 +01:00
wvengen d08f120b27 show message when ignoring articles due to missing order number 2014-01-24 22:20:29 +01:00
wvengen 8db516c5f0 Merge branch 'master' into feature-cleaner_order_details 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2014-01-20 13:36:46 +01:00
wvengen 9308096e96 Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi 
fix root redirect when using suburi
 2014-01-20 03:13:25 -08:00
wvengen 65041c78c5 allow to preselect order view 2014-01-17 15:04:03 +01:00
wvengen 151f851799 do not require authentication for root redirect 2014-01-15 16:33:13 +01:00
wvengen ecb2f2a015 fix root redirect when using suburi 2014-01-15 15:43:29 +01:00
wvengen bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen 8760d87a76 fix receive notice 2014-01-13 11:48:43 +01:00
wvengen b30b424540 Merge branch 'master' into feature-receive 
Conflicts:
	app/helpers/finance/order_articles_helper.rb
 2014-01-09 18:42:29 +01:00
wvengen ce17bf33e0 complete and improve receive i18n 2014-01-08 13:39:49 +01:00
wvengen 69a29b8296 Merge pull request #245 from fsmanuel/rss_feed + 1 2014-01-06 13:55:32 +01:00
Manuel Wiedenmann 0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
Robert Waltemath a0f55ba812 Clear return_to URL in session when signing out. 2014-01-03 19:42:08 +01:00
Robert Waltemath 2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +01:00
Robert Waltemath 03f61668aa Redirect to home page on denied access (fixes #237). 2014-01-03 13:51:00 +01:00
wvengen 98f59a3de3 Readonly receive input if GroupOrderArticle result has manually been changed 
Conflicts:
	app/helpers/orders_helper.rb
	app/views/orders/_edit_amount.html.haml
 2014-01-03 10:33:09 +01:00
Julius dd138da1a6 Change comment according to 9d61e2e61569159489098eda1bd6c30d7322ce76 2014-01-02 19:17:51 +01:00
Julius 8e52fca304 Do not set quantity of newly created OrderArticles to 1 2014-01-02 19:17:46 +01:00
Julius a384532619 Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b 2014-01-02 19:17:41 +01:00
Julius 033aa90698 Use OrderArticle#create in receive form instead of Order#add_article 2014-01-02 19:16:09 +01:00
Julius 59c118a171 Apply publish/subscribe for OrderArticle#create 2014-01-02 19:16:03 +01:00
Julius 01264bc0ac Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +01:00
Julius baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders 2014-01-02 19:14:41 +01:00
Julius cf1e68f11d Allow to edit OrderArticle in Order#receive form 2014-01-02 19:14:33 +01:00
Julius 81dfe8110c Apply publish/subscribe for OrderArticle#update 2014-01-02 19:14:07 +01:00
wvengen 27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive 2014-01-02 18:57:59 +01:00
wvengen 7ef6832ab3 fix invite authentication 2013-12-22 14:20:25 +01:00
wvengen cee96915f9 remove unused redirect_to functionality 2013-12-22 13:59:16 +01:00
wvengen a28c6031a4 fix receive exception when input is set to nil 2013-12-21 17:39:20 +01:00