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 |
|
Benjamin Meichsner
|
0d3564492b
|
Fixed bug in sorting articles in balancing view.
|
2013-03-12 18:54:51 +01:00 |
|
Benjamin Meichsner
|
c4376f35bf
|
Removed article from includes in as it does not work with acts_as_paranoid.
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62.
Better we remove acts_as_paranoid and filter manually?
|
2013-03-12 12:50:56 +01:00 |
|
Benjamin Meichsner
|
6196bdae41
|
Added some eager loading for balancing new.
|
2013-03-12 12:38:08 +01:00 |
|
Benjamin Meichsner
|
40d9195eac
|
Fixed broken group_orders after editing order.
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
|
2013-03-12 11:26:14 +01:00 |
|
Benjamin Meichsner
|
c18fb20115
|
Ensure to get also deleted entries in belongs_to assoc.
|
2013-03-10 19:39:59 +01:00 |
|
Benjamin Meichsner
|
b0e12d177e
|
Fixed editing an order and take care of group_orders.
|
2013-03-10 19:22:26 +01:00 |
|
Benjamin Meichsner
|
762d529894
|
Added info link for apple restriction feature.
|
2013-03-09 18:14:53 +01:00 |
|
Benjamin Meichsner
|
50873addf8
|
Fixed deleting of articles. Added missing id.
|
2013-03-09 16:46:33 +01:00 |
|
Benjamin Meichsner
|
1cbf663b39
|
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
|
2013-03-09 16:31:00 +01:00 |
|
Benjamin Meichsner
|
2f109c376d
|
Fixed bug when submitting huge forms. (stock taking etc)
|
2013-03-09 16:14:20 +01:00 |
|
wvengen
|
19527f8425
|
fix some link handling in i18n (using html_safe)
|
2013-03-09 00:48:52 +01:00 |
|
wvengen
|
cb537bc11c
|
start articles i18n
|
2013-03-09 00:40:07 +01:00 |
|
wvengen
|
b81f414ae5
|
finish finance/order_articles i18n + en translation
|
2013-03-08 23:35:50 +01:00 |
|
Robert Waltemath
|
63d8a3a1a6
|
Do not exclude ordered articles (with zero quantity) when editing orders.
|
2013-03-07 20:43:02 +01:00 |
|
Robert Waltemath
|
93a99c45d8
|
Revert "Do not subtract articles in open orders when calculating quantity."
This reverts commit 6bf3b241e6.
|
2013-03-07 20:39:35 +01:00 |
|
Robert Waltemath
|
6bf3b241e6
|
Do not subtract articles in open orders when calculating quantity.
|
2013-03-06 14:19:06 +01:00 |
|
wvengen
|
c9b2d01fa5
|
i18n last merge
|
2013-03-06 01:24:57 +01:00 |
|
wvengen
|
2d382df1f1
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/stockit_controller.rb
app/models/ordergroup.rb
app/models/workgroup.rb
app/views/stockit/index.html.haml
|
2013-03-06 01:01:12 +01:00 |
|
wvengen
|
2b03a15a9a
|
finish finance invoice i18n and en translation
|
2013-02-27 12:31:01 +01:00 |
|
wvengen
|
d3d4bf1e2b
|
add en translation of finance
|
2013-02-27 12:11:48 +01:00 |
|