Commit Graph

158 Commits

Author SHA1 Message Date
Patrick Gansterer 72ef31c0ec Make unassigned tasks more prominent in the dashboard
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
2016-03-04 17:15:45 +01:00
Patrick Gansterer 6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer 1315103a7d Add role_invoices
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
Patrick Gansterer 460cf1e82c Change relationship of invoices #390
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
2016-03-04 15:55:39 +01:00
Patrick Gansterer 3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen bc0c1f1bbe Localeapp roundtrip 2015-11-14 16:38:35 +01:00
wvengen dc731ee40d Make current_orders plugin configurable 2015-07-21 00:13:15 +02:00
wvengen 13768285e4 localeapp roundtrip 2015-05-15 14:26:08 +02:00
wvengen beee5a1245 Localeapp roundtrip 2015-05-02 15:27:06 +02:00
wvengen 16e9210035 Fix title of new upload screen 2015-04-11 02:52:57 +02:00
wvengen a6f02a24d4 Improve wiki edit documentation 2015-03-20 15:50:49 +01:00
Patrick Gansterer e57fd500fc Add possibility to copy an order
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
wvengen cfdfe5f23e Improve header+footer in PDFs 2015-01-03 00:24:33 +01:00
wvengen 6272816358 Localeapp roundtrip 2014-12-31 13:11:39 +01:00
wvengen 0aa098e75b localeapp roundtrip 2014-12-15 21:11:41 +01:00
wvengen 5c78bdde7e Cleanup old task-related i18n 2014-11-23 01:42:15 +01:00
wvengen 68d54e7e25 add sudo functionality 2014-10-18 17:58:31 +02:00
wvengen e9dcaadb06 localeapp roundtrip 2014-10-14 18:39:05 +02:00
wvengen 9a7b3378c3 Make invalid login message depend on use_nick (closes foodcoops#321) 2014-10-09 09:42:13 +02:00
wvengen 575928d8a3 fix use_messages heading in config screen (closes foodcoops#319) 2014-10-07 01:07:11 +02:00
wvengen 418a8b5806 fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
2014-09-15 13:52:35 +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 3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +02:00
wvengen 7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen a39c56fdf1 update strings from localeapp 2014-09-02 14:21:15 +02:00
wvengen d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen 94e100b78b localeapp roundtrip 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 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
wvengen fe0b17cdb0 cleanup email footer 2014-05-13 17:01:25 +02:00
wvengen 9214fff5a1 localeapp roundtrip (mostly formatting changes) 2014-03-15 17:17:25 +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 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 bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen cb3e2f7ca0 Merge branch 'master' into feature-receive
Conflicts:
	config/locales/de.yml
2014-01-11 15:56:33 +01:00
wvengen 063ec61753 localeapp roundtrip 2014-01-10 00:00:57 +01:00
Julius f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +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 3336065218 Add missing translations for ArticlePrice attributes 2013-12-30 12:38:26 +01:00
wvengen a02ca1b9c0 localeapp roundtrip [ci skip] 2013-12-17 18:54:05 +01:00
wvengen 94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
	app/views/deliveries/_stock_article_form.html.haml
	config/locales/de.yml
	config/locales/en.yml
2013-12-17 15:58:47 +01:00
wvengen 5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
Publish/subscribe pattern for DOM updates after AJAX database manipulation
2013-12-17 06:28:25 -08:00
wvengen 11a2b865aa localeapp roundtrip 2013-12-14 13:35:52 +01:00
wvengen 2b6a84ddf8 localeapp roundtrip 2013-12-12 00:33:35 +01:00
wvengen 6bbc614e42 localeapp roundtrip (closes foodcoops#156) 2013-12-10 18:03:50 +01:00
Julius 7eb64e3c9d Update locales 2013-12-07 17:58:06 +01:00
Julius 7a673b1a8b Move stock_article locales from delivery to stock_article 2013-12-07 17:48:04 +01:00
Julius 13bb4e0a8b Rename 'simple_form.hints.stock_article.copy_stock_article' to 'simple_form.hints.stock_article.copy' 2013-12-07 15:12:08 +01:00
wvengen b05c75aef3 localeapp roundtrip 2013-12-06 23:12:15 +01:00
wvengen 1c4b9591a2 fix edit article dialog title 2013-12-06 12:34:14 +01:00
wvengen e42589ae72 translations update (localeapp roundtrip) 2013-12-06 11:58:08 +01:00
wvengen 6410396489 localeapp roundtrip 2013-11-24 02:12:32 +01:00
wvengen 2ac7016ccc localeapp roundtrip [ci skip] 2013-11-18 15:01:26 +01:00
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
wvengen 5daf1a466f localeapp roundtrip 2013-11-11 18:08:28 +01:00
wvengen f7a0103553 clearer login field name 2013-10-30 21:28:35 +01:00
wvengen 3588962329 remove unused layout 2013-10-30 20:53:01 +01:00
wvengen 5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen 13a7f84e35 localeapp roundtrip [ci skip] 2013-10-23 12:48:19 +02:00
wvengen d1f9b0b090 apply changes to other translations + translation fixes 2013-10-21 17:55:58 +02:00
wvengen 98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
wvengen 6e5184d796 use rails-i18n translations 2013-10-17 16:43:14 +02:00
wvengen 092bc6b150 translation updates 2013-10-17 15:32:03 +02:00
wvengen 34a4951e28 Merge branch 'master' into i18n
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
2013-10-09 23:57:43 +02:00
wvengen 762292ef8e small i18n move 2013-10-09 22:29:19 +02:00
wvengen 1b49a08c5e localeapp roundtrip 2013-10-08 11:42:23 +02:00
Julius ac1341d5b0 Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip 2013-10-03 23:22:31 +02:00
Julius fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
wvengen 1674dcf851 fix i18n of article sync 2013-10-03 14:36:53 +02:00
wvengen 3574f239c6 localeapp roundtrip 2013-10-02 17:33:37 +02:00
wvengen 1d8fefcfb7 small i18n update 2013-10-02 17:08:24 +02:00
wvengen 0bb62332c0 localeapp roundtrip 2013-10-01 00:05:46 +02:00
wvengen f1f7e8d709 localeapp roundtrip 2013-09-18 19:14:48 +02:00
Benjamin Meichsner 5444c3a1c0 Merged updates from localeapp. 2013-09-18 17:48:24 +02:00
wvengen ee31c0c2af localeapp roundtrip 2013-09-10 12:06:40 +02:00
wvengen 6418790ef5 localeapp roundtrip, with updated translations 2013-09-10 10:46:02 +02:00
wvengen 9922c0322a first version of new translation: French 2013-09-06 19:41:24 +02:00
Benjamin Meichsner 51a91f376d Updated locales from localeapp. 2013-09-02 13:34:30 +02:00
wvengen 3e4c535bb1 update translations and localeapp roundtrip 2013-07-18 19:27:52 +02:00
wvengen 1d12e09342 update translations and localeapp roundtrip 2013-07-18 16:22:38 +02:00
wvengen 3fd498d29f translations update 2013-07-13 12:37:20 +02:00
wvengen 66e0bbc348 cleanup translation changes introduced by last merge 2013-07-11 22:09:58 +02:00
wvengen 2ee1bef410 translation updates 2013-07-11 21:36:32 +02:00
wvengen 9ef208fa13 small translation changes 2013-06-29 03:02:05 +02:00
wvengen b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen 9b0db5bb0b translation updates: capitalisations, order_result mail 2013-06-29 02:46:20 +02:00