Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
2133 commits 22 branches 1 tag 31 MiB
Commit graph

284 commits

Author SHA1 Message Date
wvengen
4433a665e4 Merge pull request #421 from foodcoop1040/edit_links 
Add page to edit deliveries and orders linked to an invoice
 2016-03-11 13:39:27 +01:00
Patrick Gansterer
efb929e64f Allow editing of linked deliveries and orders at invoice 2016-03-11 13:23:13 +01:00
Patrick Gansterer
9c4d9d5c20 Add stock group order 
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
 2016-03-11 13:15:16 +01:00
Patrick Gansterer
253512eb51 Add break to ordergroup 
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
 2016-03-08 04:38:13 +01:00
wvengen
14e2fd179e Merge pull request #403 from foodcoops/feature/402-messagegroups 
Add messagegroups
 2016-03-07 22:36:37 +01:00
wvengen
5d9e1845b7 Fix i18n key typo 2016-03-07 21:06:49 +01:00
wvengen
d358278333 Merge pull request #416 from foodcoop1040/invite_config 
Add config option to disable the invites
 2016-03-07 19:47:00 +01:00
wvengen
0b70ce39a8 Merge pull request #414 from foodcoop1040/ftc 
Add a button to add all ordergroups to a new finanacial transaction c…
 2016-03-07 19:45:45 +01:00
wvengen
cb8205e4de Merge pull request #413 from foodcoop1040/error_translations 
Add missing German translations for error messages
 2016-03-07 19:44:29 +01:00
wvengen
b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm 
Get rid of duplicated confirm_delete translations
 2016-03-07 19:44:06 +01:00
Patrick Gansterer
7aacc7fef6 Fix German ui.* translations 2016-03-07 15:21:03 +01:00
Patrick Gansterer
e16a0fb336 Add config option to disable the invites 
Some foodcoops require that an admin adds all users to have more control
over the users.
 2016-03-06 13:56:33 +01:00
Patrick Gansterer
a5d0c5ccab Add a button to add all ordergroups to a new finanacial transaction collection 
This function can be used if we need to add the same financial transaction
to all ordergroups at the same time. E.g. the monthly membership fee.
 2016-03-06 11:53:31 +01:00
Patrick Gansterer
f24a18371e Add missing German translations for error messages 2016-03-04 23:23:56 +01:00
Patrick Gansterer
c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer
5e744453f8 Add more infos to the invoice page 
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
 2016-03-04 22:26:55 +01:00
Patrick Gansterer
0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer
b05ac2ab64 Add deleted_at for User 
Do not remove the user from the database. Mark as deleted instead.
 2016-03-04 19:03:52 +01:00
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
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +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
13768285e4 localeapp roundtrip 2015-05-15 14:26:08 +02:00
wvengen
beee5a1245 Localeapp roundtrip 2015-05-02 15:27:06 +02:00
Patrick Gansterer
700eed27b8 Add last user login and activity 2015-03-03 14:55:30 +01:00
Patrick Gansterer
55e8ff481c Add reply_to and group_id to messages schema 2015-02-27 17:30:26 +01:00
wvengen
26c364bf4b Merge pull request #354 from foodcoop1040/recipients 
Show recipients of messages
 2015-02-18 23:28:29 +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
Patrick Gansterer
23f0a1613a Show recipients of messages 2015-02-18 17:45:20 +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
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
418a8b5806 fix i18n issues + localeapp roundtrip 
thanks, i18n-tasks!
 2014-09-15 13:52:35 +02:00
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
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
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
286c96196c localeapp roundtrip 2014-02-15 12:37:01 +01:00
wvengen
f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +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
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
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
Julius
f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +01:00
Robert Waltemath
2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +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
Julius
f3c3b7af34 Fix StockArticle#derive title i18n 2013-12-28 20:07:28 +01:00
Julius
3bf1392251 Show clearer error message on WikiCloth exception 2013-12-22 23:34:54 +01:00
Julius
42e983f7ee Move html markup of WikiCloth exception from locales to controller 2013-12-22 18:09:40 +01:00
Julius
496a250495 Rescue on WikiCloth exception 2013-12-22 12:17:02 +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
a91c97526e complete German translations (thanks @fsmanuel) [ci skip] 2013-12-16 10:55:45 +01: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
30b35cdd11 Improve usability of supplier selection for stock_articles in delivery form 2013-12-09 00:03:07 +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
112fa3be23 fix forgotten i18n string (affects foodcoops#137) 2013-12-06 23:08:28 +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
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
6e5184d796 use rails-i18n translations 2013-10-17 16:43:14 +02:00
wvengen
a339ae4c7c i18n simple_form move of remaining labels 2013-10-10 19:12:59 +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
67e29620f4 i18n simple_form move of invoices 2013-10-09 23:37:08 +02:00
wvengen
6ba971fe15 i18n simple_form move of deliveries 2013-10-09 23:19:40 +02:00
wvengen
c3d22e883d i18n simple_form move of suppliers 2013-10-09 23:12:26 +02:00