Benjamin Meichsner
|
f4a0e29297
|
Fixed bug in with new shared multiple suppliers feature.
|
2013-06-12 10:47:54 +02:00 |
|
Benjamin Meichsner
|
25fbb47320
|
Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers
|
2013-06-12 10:40:20 +02:00 |
|
Robert Waltemath
|
6bdb7b35f0
|
Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing.
|
2013-06-10 11:37:59 +02:00 |
|
Benjamin Meichsner
|
241c5666ec
|
Merge pull request #119 from balkansalat/rails3-improve-checkall-performance
Improve performance of *check-all* checkbox
|
2013-06-09 09:19:19 -07:00 |
|
Benjamin Meichsner
|
fd091d9b89
|
Merge pull request #118 from balkansalat/rails3-order-delivery-articles
Order articles for delivery selection by name only
|
2013-06-09 09:15:20 -07:00 |
|
Benjamin Meichsner
|
7c4ee01ff2
|
Define autofill attributes when creating new supplier from shared_supplier.
|
2013-06-09 18:02:47 +02:00 |
|
Benjamin Meichsner
|
e74c6b4068
|
Avoid having content-length warning in dev log.
|
2013-06-09 17:33:11 +02:00 |
|
Benjamin Meichsner
|
60afa85ece
|
Merge pull request #116 from balkansalat/rails3-balancing-delete-article
Update ordergroup prices in OrderArticles via Order.
|
2013-06-09 08:26:38 -07:00 |
|
Julius
|
0ebe38b7a9
|
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance
|
2013-06-07 09:52:56 +02:00 |
|
Julius
|
966902ff55
|
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles
|
2013-06-07 09:51:50 +02:00 |
|
Julius
|
0058e826b2
|
Reorder delivery articles
|
2013-06-07 09:35:22 +02:00 |
|
Julius
|
b8a23a396c
|
Remove test variable
|
2013-06-06 17:09:22 +02:00 |
|
Julius
|
0d3c23f814
|
Improve performance of data-check-all
|
2013-06-06 17:06:05 +02:00 |
|
Robert Waltemath
|
c194d2545f
|
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
|
2013-06-04 11:28:25 +02:00 |
|
Robert Waltemath
|
2a1176c31a
|
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
|
2013-05-30 10:54:22 +02:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|