Benjamin Meichsner
|
5b81c53a73
|
Fixed setting all user setting to false in user profile.
|
2013-04-08 15:08:57 +02:00 |
|
Benjamin Meichsner
|
77d4caea68
|
Added quiet_assets gem to have cleaner log file in developing.
|
2013-04-08 15:08:18 +02:00 |
|
Benjamin Meichsner
|
20e439c2a7
|
Allow article price equal to zero. Closes #111
|
2013-04-08 14:40:02 +02:00 |
|
Benjamin Meichsner
|
4966aae0ad
|
Fixed modal forms. Submit form when hitting enter.
|
2013-04-08 14:27:23 +02:00 |
|
Benjamin Meichsner
|
9c21a14c7e
|
Update group results when editing order article in balancing.
|
2013-04-08 14:26:40 +02:00 |
|
Benjamin Meichsner
|
220343128c
|
Fixed wrong articles total in group_order#show.
|
2013-04-08 13:39:02 +02:00 |
|
Benjamin Meichsner
|
03ea8e194e
|
Fixed loosing assignments when updating a task.
|
2013-04-08 01:31:21 +02:00 |
|
Benjamin Meichsner
|
13e921a632
|
Fixed some errors in articles#sync. Show better error messages.
|
2013-04-08 01:00:49 +02:00 |
|
wvengen
|
f1d6df9ecc
|
move commonly used verbs to common i18n identifier
|
2013-04-04 02:49:52 +02:00 |
|
wvengen
|
4aa40b387a
|
finish article_categories controllers i18n + translation
|
2013-04-04 02:10:52 +02:00 |
|
wvengen
|
8c8778459e
|
finish documents i18n
|
2013-04-04 02:04:31 +02:00 |
|
wvengen
|
24d04b25db
|
fix some small i18n errors
|
2013-04-04 00:56:45 +02:00 |
|
wvengen
|
ec1ef0289b
|
finish i18n of article_categories + translation
|
2013-04-04 00:44:07 +02:00 |
|
wvengen
|
0bb080526a
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/login_controller.rb
app/models/message.rb
app/views/sessions/new.html.haml
|
2013-04-04 00:29:50 +02:00 |
|
wvengen
|
e1f5969719
|
use short form plus title for unit quantity
|
2013-04-04 00:24:14 +02:00 |
|
wvengen
|
f55a0955d3
|
add articles, workgroups translation plus other translation updates
|
2013-04-04 00:13:16 +02:00 |
|
Benjamin Meichsner
|
53518039f1
|
Fixed error message, when using GET for password reset actions.
|
2013-03-27 22:20:54 +01:00 |
|
Benjamin Meichsner
|
915e1b9e79
|
Fixed bug in reset password error handling.
|
2013-03-27 22:12:46 +01:00 |
|
Benjamin Meichsner
|
18f6cadca2
|
Ensure mail privacy in message reply and show view.
Thanks to @JuliusR for reporting.
|
2013-03-24 01:37:58 +01:00 |
|
Benjamin Meichsner
|
da72d3a61c
|
Only show undeleted articles in delivery/stock_taking forms.
Fixed 100.
|
2013-03-23 18:25:54 +01:00 |
|
Benjamin Meichsner
|
80b203a8da
|
Fixed missing templates in accept invitation action.
|
2013-03-23 17:51:33 +01:00 |
|
wvengen
|
f81e315d6f
|
finish i18n of models without view
|
2013-03-22 01:21:44 +01:00 |
|
wvengen
|
75a1051668
|
finish articles i18n, controller+model
|
2013-03-22 00:59:42 +01:00 |
|
wvengen
|
aabeb1a332
|
finish articles i18n
|
2013-03-22 00:20:37 +01:00 |
|
wvengen
|
7af796c09c
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
|
2013-03-21 22:08:09 +01:00 |
|
Benjamin Meichsner
|
22550029b3
|
Added missing ajax support for messages index. Fixed #101
|
2013-03-20 23:31:13 +01:00 |
|
Benjamin Meichsner
|
957dbc7202
|
Updated to rails 3.2.13
|
2013-03-19 13:18:48 +01:00 |
|
Benjamin Meichsner
|
e275403cdd
|
Do not destroy articles in supplier sync. Mark them as deleted.
|
2013-03-18 19:05:11 +01:00 |
|
Benjamin Meichsner
|
528295884e
|
Allow deleting of category, when there are only deleted articles left.
|
2013-03-17 20:13:11 +01:00 |
|
Benjamin Meichsner
|
931bb1d7ca
|
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
|
2013-03-17 20:03:18 +01:00 |
|
Benjamin Meichsner
|
6745b79bb9
|
Allow importing articles again, when article was deleted before.
|
2013-03-17 20:02:14 +01:00 |
|
bennibu
|
28343fc124
|
Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2
Prevent sold-out articles from being removed from stock order when editing
|
2013-03-17 11:50:56 -07:00 |
|
bennibu
|
033d3459a0
|
Merge pull request #98 from balkansalat/rails3-stock-taking-article-name
Prevent article name from being truncated in StockTaking form
|
2013-03-17 11:41:32 -07:00 |
|
bennibu
|
bd0c251313
|
Merge pull request #97 from balkansalat/rails3-stockit-increase
Fix stockit increase formula in javascript
|
2013-03-17 11:34:16 -07:00 |
|
Benjamin Meichsner
|
59de2e42a9
|
Fixed showing deleted articles when asking for available articles.
|
2013-03-17 18:36:34 +01:00 |
|
Benjamin Meichsner
|
dd0bd0ad7e
|
Fixed updating order article in stockit balancing.
|
2013-03-17 18:33:04 +01:00 |
|
Benjamin Meichsner
|
f7e885de7e
|
Fixed bug in fax template when there are missing supplier infos.
|
2013-03-17 18:10:48 +01:00 |
|
Benjamin Meichsner
|
3a9ec5a3dd
|
Fixed wiki site-map, when there is no homepage.
|
2013-03-17 17:57:35 +01:00 |
|
Benjamin Meichsner
|
707f989768
|
Fixed routes in redirect after direct_close of orders.
|
2013-03-17 17:50:50 +01:00 |
|
Benjamin Meichsner
|
329c451774
|
Fixed articles sync view.
|
2013-03-17 17:47:37 +01:00 |
|
Benjamin Meichsner
|
c05b3e0e19
|
Balancing: Do not update oder summary automaticly when changing group orders.
|
2013-03-17 15:47:50 +01:00 |
|
Benjamin Meichsner
|
9cc98b4662
|
Added some more eager loading for balancing view.
|
2013-03-17 15:12:14 +01:00 |
|
Benjamin Meichsner
|
07581b7ecf
|
Removed acts_as_paranoid. Implemented own version.
|
2013-03-16 17:57:38 +01:00 |
|
Robert Waltemath
|
981944b869
|
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
Conflicts:
Gemfile
db/schema.rb
|
2013-03-15 17:59:19 +01:00 |
|
Julius
|
6aa0e0b736
|
Rename and comment new functions for fixing stock ordering
|
2013-03-15 08:50:55 +01:00 |
|
Julius
|
396e220369
|
Prevent article names from being truncated in StockTaking form
|
2013-03-14 22:30:22 +01:00 |
|
Julius
|
3208321319
|
Fix stockit increase formula for present behavior
|
2013-03-14 21:55:10 +01:00 |
|
Julius
|
8d0761a6c8
|
Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2
|
2013-03-14 21:14:42 +01:00 |
|
Julius
|
a096b3618c
|
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
|
2013-03-14 20:54:59 +01:00 |
|
Benjamin Meichsner
|
8bafb3f4b2
|
Show supplier name for articles in stockit order.
|
2013-03-12 19:08:18 +01:00 |
|