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
|
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 |
|
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 |
|
Julius
|
467b53c009
|
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete
|
2013-02-25 11:14:48 +01:00 |
|
Julius
|
0e1bd5c75e
|
Improve (AJAX) deletion of StockArticles
|
2013-02-25 11:12:28 +01:00 |
|
Julius
|
5dc3fc30ad
|
Revert 099e2b9b06
|
2013-02-25 10:29:47 +01:00 |
|
Julius
|
8f15cfb446
|
Revert 396a47b6af
|
2013-02-25 10:13:44 +01:00 |
|
Julius
|
ccf0d010b4
|
Apply AJAX for deleting a StockArticle
|
2013-02-25 10:02:21 +01:00 |
|
Benjamin Meichsner
|
6685012a3e
|
Fixed bad syntax (from already dropped meta_where gem).
Thanks to wvengen, closed #91
|
2013-02-24 23:56:56 +01:00 |
|
Benjamin Meichsner
|
82178161fa
|
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
Fixed #88
|
2013-02-24 23:26:16 +01:00 |
|
Julius
|
a511da9ae3
|
Prevent stock_articles from appearing in supplier article index
|
2013-01-30 21:21:49 +01:00 |
|
Julius
|
2c9fdcd79e
|
Show customer number in fax pdf
|
2013-01-30 19:46:18 +01:00 |
|
Julius
|
8c7a4f0331
|
Fix empty dd in horizontal dl
|
2013-01-29 17:52:44 +01:00 |
|
Julius
|
396a47b6af
|
Improve stock_article_selections
|
2013-01-28 20:46:35 +01:00 |
|
Julius
|
524819b86f
|
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
Conflicts:
app/helpers/application_helper.rb
|
2013-01-27 22:01:53 +01:00 |
|
Benjamin Meichsner
|
8b2b70f8bf
|
Fixed saving user for new orders.
|
2013-01-26 16:24:45 +01:00 |
|
Benjamin Meichsner
|
04b611a080
|
Temporairly deactivated helper in new delivery form.
|
2013-01-26 15:57:29 +01:00 |
|
Benjamin Meichsner
|
310a97912c
|
Fixed disabling submit_button in group order form.
|
2013-01-26 15:41:46 +01:00 |
|
Benjamin Meichsner
|
3ab3ff2bc4
|
Minor speed improvements for group order load.
|
2013-01-26 15:18:35 +01:00 |
|
Benjamin Meichsner
|
2a66d37c3a
|
Fixed wrong start balance in new group order.
|
2013-01-26 15:17:56 +01:00 |
|
Julius
|
ce0300df43
|
Fix order.created_by
|
2013-01-12 16:24:13 +01:00 |
|
Julius
|
099e2b9b06
|
Add stock_article_selection (deleting multiple stock articles at once)
|
2013-01-12 16:14:06 +01:00 |
|
benni
|
0364562273
|
Fixed return_to when authorization gets lost.
|
2012-12-30 16:34:01 +01:00 |
|
benni
|
f6ff422405
|
Fixed missing line breaks in haml email templates.
|
2012-12-30 16:24:36 +01:00 |
|
benni
|
349cadd5e9
|
Renabled mail delivering in invites and login contrller.
|
2012-12-30 16:11:35 +01:00 |
|
benni
|
28aec7e4d6
|
Replace ordergroup.account_updated with non database attr.
|
2012-12-30 15:31:37 +01:00 |
|
benni
|
a489079334
|
Fixed wrong request method in deny_access.
|
2012-12-30 15:13:50 +01:00 |
|
benni
|
ba75a6e328
|
Fixed accidently switching to english locale in production.
|
2012-12-29 17:48:14 +01:00 |
|
benni
|
cd583cc9b2
|
Set host infos for urls in emails via app_config.
|
2012-12-28 13:55:18 +01:00 |
|
benni
|
db07b28b1c
|
Fixed bug in accessing foodsoft config.
|
2012-12-28 13:28:03 +01:00 |
|
benni
|
2c0fe08be6
|
Replaced delayed_job with resque. See README_DEVEL
|
2012-12-23 17:38:04 +01:00 |
|