Commit Graph

363 Commits

Author SHA1 Message Date
wvengen 94e100b78b localeapp roundtrip 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 e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen c54e15dc04 localeapp roundtrip 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 a7ebf78fd4 hide insignificant zeroes for percentage 2014-05-17 14:20:48 +02:00
wvengen cf0558b1ff localeapp roundtrip 2014-05-13 17:01:27 +02:00
wvengen 9821f111c2 add missing locale 2014-05-13 17:01:26 +02:00
wvengen 64bb8e043d enable/disable plugins by config option 2014-05-13 17:01:26 +02:00
wvengen 852f3484ad make settle directly less dangerous
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
wvengen 9743a9f112 localeapp roundtrip 2014-05-13 17:01:25 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen fe0b17cdb0 cleanup email footer 2014-05-13 17:01:25 +02:00
wvengen 48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +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 9214fff5a1 localeapp roundtrip (mostly formatting changes) 2014-03-15 17:17:25 +01:00
wvengen bb9269f755 avoid word-wrap when showing currency 2014-03-15 16:40:53 +01:00
wvengen 346bf00b67 localeapp roundtrip (includes updated German translation) 2014-02-19 11:42:25 +01:00
wvengen e61b3dc248 update Dutch translation 2014-02-15 12:38:05 +01:00
wvengen 286c96196c localeapp roundtrip 2014-02-15 12:37:01 +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 f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +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 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 c5cc714f9b add Dutch translation texts 2014-01-20 13:30:14 +01:00
wvengen 3b2d4dfd08 localeapp roundtrip 2014-01-20 12:59:57 +01:00
wvengen 6c0de3dc74 Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
Conflicts:
	config/locales/de.yml
	config/locales/en.yml
2014-01-20 12:12:00 +01:00
wvengen 5b6d1a66a6 complete show order i18n
Conflicts:
	app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01:00
wvengen 42d622d1b2 cleanup orders and add search
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/orders/_articles.html.haml
	app/views/orders/show.html.haml
2014-01-17 13:41:38 +01:00
wvengen bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen 45e529b008 revert i18n attributes pluralisation
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e0 and 9db8cb72df)
2014-01-11 16:30:17 +01:00
wvengen cb3e2f7ca0 Merge branch 'master' into feature-receive
Conflicts:
	config/locales/de.yml
2014-01-11 15:56:33 +01:00
Julius 9db8cb72df Synchronize German and English locales 2014-01-10 20:50:58 +01:00
wvengen 063ec61753 localeapp roundtrip 2014-01-10 00:00:57 +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 2b97ca050a i18n oops 2014-01-09 13:22:32 +01:00
wvengen 124341c7d6 receive helper and i18n cleanup 2014-01-09 13:01:10 +01:00
wvengen ce17bf33e0 complete and improve receive i18n 2014-01-08 13:39:49 +01:00
wvengen 6e60f94484 small receive-related i18n updates 2014-01-08 12:52:29 +01:00
Julius 563993fffa Complete I18n of current receive screen 2014-01-08 00:06:50 +01:00
Julius d7c771d10a Continue I18n of receive screen 2014-01-06 23:48:39 +01:00
wvengen 69a29b8296 Merge pull request #245 from fsmanuel/rss_feed + 1 2014-01-06 13:55:32 +01:00
Julius f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +01:00
Manuel Wiedenmann 0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
Robert Waltemath 2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +01:00
wvengen 133429720c old price display tweaks 2014-01-03 14:11:50 +01:00