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
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
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
0fc80a1ef5
Rename translation "admin.confirm" to "ui.confirm_delete"
2016-03-04 20:10:11 +01:00
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
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
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +01:00
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +01:00
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
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
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +01:00
227ca0dd84
Merge pull request #387 from foodcoops/feature/boxfills
...
Add optional boxfill phase to orders (+ bootstrap buttons)
2015-11-20 14:25:41 +01:00
bc0c1f1bbe
Localeapp roundtrip
2015-11-14 16:38:35 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
9efa9d5d43
Handle errors using Gaffe
2015-07-21 00:08:17 +02:00
13768285e4
localeapp roundtrip
2015-05-15 14:26:08 +02:00
ec03d579d0
Merge branch 'feature/edit-recurring-task'
...
Conflicts:
config/locales/en.yml
2015-05-08 20:10:23 +02:00
a00e7c94be
Rework user-interface for editing recurring tasks
2015-05-08 17:39:20 +02:00
beee5a1245
Localeapp roundtrip
2015-05-02 15:27:06 +02:00
5d47171b76
Improve upload error handling
2015-04-17 18:44:38 +02:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
d5a7f6a074
Move file import logic to model
2015-04-11 02:52:57 +02:00
0d92007274
Improve upload form
2015-04-11 02:52:57 +02:00
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
08c8d25a9d
New message form and checkbox papercuts
2015-04-11 02:32:30 +02:00
07311aa032
Merge pull request #357 from foodcoop1040/user_activity
...
Add last user login and activity
2015-04-03 16:01:18 +02:00
15ac566ece
Add help page for Foodsoft variables
2015-03-20 16:32:58 +01:00
a6f02a24d4
Improve wiki edit documentation
2015-03-20 15:50:49 +01:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
26c364bf4b
Merge pull request #354 from foodcoop1040/recipients
...
Show recipients of messages
2015-02-18 23:28:29 +01:00
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
23f0a1613a
Show recipients of messages
2015-02-18 17:45:20 +01:00
cfdfe5f23e
Improve header+footer in PDFs
2015-01-03 00:24:33 +01:00
1c0db4374f
Merge pull request #332 from foodcoops/feature/edit-address
...
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
0aa098e75b
localeapp roundtrip
2014-12-15 21:11:41 +01:00
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
e9dcaadb06
localeapp roundtrip
2014-10-14 18:39:05 +02:00
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
575928d8a3
fix use_messages heading in config screen (closes foodcoops#319)
2014-10-07 01:07:11 +02:00
668ba1e5d6
add webstats_tracking_code to configuration screen (closes foodcoops#311)
2014-09-22 09:36:36 +02:00
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
1a3b690757
add custom css to config screen
2014-09-02 15:02:26 +02:00
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
68ccc19c70
allow to configure currency (closes foodcoops#258)
2014-09-02 15:02:25 +02:00
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
a39c56fdf1
update strings from localeapp
2014-09-02 14:21:15 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
94e100b78b
localeapp roundtrip
2014-06-23 17:51:20 +02:00
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00
c54e15dc04
localeapp roundtrip
2014-06-23 17:51:18 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
a7ebf78fd4
hide insignificant zeroes for percentage
2014-05-17 14:20:48 +02:00
cf0558b1ff
localeapp roundtrip
2014-05-13 17:01:27 +02:00
9821f111c2
add missing locale
2014-05-13 17:01:26 +02:00
64bb8e043d
enable/disable plugins by config option
2014-05-13 17:01:26 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
9743a9f112
localeapp roundtrip
2014-05-13 17:01:25 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +02:00
0014435663
improved shared database import ui
2014-05-13 17:01:24 +02:00
9214fff5a1
localeapp roundtrip (mostly formatting changes)
2014-03-15 17:17:25 +01:00
346bf00b67
localeapp roundtrip (includes updated German translation)
2014-02-19 11:42:25 +01:00
286c96196c
localeapp roundtrip
2014-02-15 12:37:01 +01:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
f9d2c20aaa
cleanup articles sorted in groups
2014-02-10 15:58:58 +01:00
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
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +01:00
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
3b2d4dfd08
localeapp roundtrip
2014-01-20 12:59:57 +01:00
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
5b6d1a66a6
complete show order i18n
...
Conflicts:
app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01:00
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
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
45e529b008
revert i18n attributes pluralisation
...
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e09db8cb72df
2014-01-11 16:30:17 +01:00
cb3e2f7ca0
Merge branch 'master' into feature-receive
...
Conflicts:
config/locales/de.yml
2014-01-11 15:56:33 +01:00
9db8cb72df
Synchronize German and English locales
2014-01-10 20:50:58 +01:00
063ec61753
localeapp roundtrip
2014-01-10 00:00:57 +01:00
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
2b97ca050a
i18n oops
2014-01-09 13:22:32 +01:00
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
ce17bf33e0
complete and improve receive i18n
2014-01-08 13:39:49 +01:00
6e60f94484
small receive-related i18n updates
2014-01-08 12:52:29 +01:00
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
69a29b8296
Merge pull request #245 from fsmanuel/rss_feed + 1
2014-01-06 13:55:32 +01:00
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +01:00
0d0ff90a64
adds an RSS feed for pages/all
2014-01-04 20:12:01 +01:00
2f02f89089
Allow login through link in message (and remember requested page).
2014-01-03 15:27:15 +01:00
133429720c
old price display tweaks
2014-01-03 14:11:50 +01:00
4c9e84ecc6
change layout of receive unlock
2014-01-03 12:40:43 +01:00
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
01264bc0ac
Clean up OrderArticle#new form and related stuff
2014-01-02 19:14:46 +01:00
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
27a73be68f
Merge remote-tracking branch 'foodcoops/master' into feature-receive
2014-01-02 18:57:59 +01:00
3336065218
Add missing translations for ArticlePrice attributes
2013-12-30 12:38:26 +01:00
f3c3b7af34
Fix StockArticle#derive title i18n
2013-12-28 20:07:28 +01:00
3bf1392251
Show clearer error message on WikiCloth exception
2013-12-22 23:34:54 +01:00
42e983f7ee
Move html markup of WikiCloth exception from locales to controller
2013-12-22 18:09:40 +01:00
496a250495
Rescue on WikiCloth exception
2013-12-22 12:17:02 +01:00
88f2dad706
language change
2013-12-18 22:14:52 +01:00
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
873a1ff108
update texts
2013-12-18 21:58:15 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
2b511ee559
Merge branch 'master' into fresh-flow
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
a02ca1b9c0
localeapp roundtrip [ci skip]
2013-12-17 18:54:05 +01:00
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
c5b1236f21
Merge pull request #218 from foodcoop-adam/article-dialog
...
Edit article user-interface update
2013-12-17 06:29:04 -08:00
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
46ab4dcc01
proper i18n of last ordergroup order (thanks @JuliusR)
2013-12-14 13:15:47 +01:00
d448707b1a
i18n cleanup (affects foodcoops#137)
2013-12-12 00:13:19 +01:00
6bbc614e42
localeapp roundtrip (closes foodcoops#156)
2013-12-10 18:03:50 +01:00
e42e27957d
improve task i18n (affects foodcoops#137)
2013-12-10 17:58:32 +01:00
85b6ff908b
make new article dialog more responsive
2013-12-10 16:41:26 +01:00
30b35cdd11
Improve usability of supplier selection for stock_articles in delivery form
2013-12-09 00:03:07 +01:00
7eb64e3c9d
Update locales
2013-12-07 17:58:06 +01:00
7a673b1a8b
Move stock_article locales from delivery to stock_article
2013-12-07 17:48:04 +01:00
92f560e189
Again revert wrong quotation mark in English locale
2013-12-07 16:46:16 +01:00
3e49104318
Revert wrong quotation mark in English locale
2013-12-07 16:44:16 +01:00
11117738ce
Resolve merge conflicts
2013-12-07 11:50:37 +01:00
dd08e277c7
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
2013-12-07 11:20:44 +01:00
112fa3be23
fix forgotten i18n string (affects foodcoops#137)
2013-12-06 23:08:28 +01:00
111c061efa
more i18n cleanup (affects foodcoops#137)
2013-12-06 22:53:59 +01:00
a475a27f79
i18n cleanup (affects foodcoops#137)
2013-12-06 22:43:36 +01:00
1c4b9591a2
fix edit article dialog title
2013-12-06 12:34:14 +01:00
e42589ae72
translations update (localeapp roundtrip)
2013-12-06 11:58:08 +01:00
9990e059d4
fix i18n
2013-11-25 15:24:20 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
6410396489
localeapp roundtrip
2013-11-24 02:12:32 +01:00
e5471b9f73
more i18n cleanup
2013-11-24 01:47:34 +01:00
652a392b37
simplify i18n and fix some small ui issues
2013-11-23 17:49:43 +01:00
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +01:00
2ac7016ccc
localeapp roundtrip [ci skip]
2013-11-18 15:01:26 +01:00
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
5daf1a466f
localeapp roundtrip
2013-11-11 18:08:28 +01:00
768796407f
Merge pull request #192 from foodcoop-adam/cleanup-stale
...
Cleanup unused views&controllers
2013-11-11 09:05:19 -08:00
891b9a21c0
fix and improve i18n of "My Ordergroup"
2013-11-09 14:19:54 +01:00
f7a0103553
clearer login field name
2013-10-30 21:28:35 +01:00
3588962329
remove unused layout
2013-10-30 20:53:01 +01:00
Patrick Gansterer
wvengen
wvengen
wvengen
Robert Waltemath
Julius
Manuel Wiedenmann