wvengen
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
wvengen
84e02b795c
proper history line
2014-01-31 17:53:10 +01:00
wvengen
5e7925366d
allow to view stock orders too
2014-01-31 13:12:29 +01:00
wvengen
5aef8e445e
add html units history line
2014-01-31 13:08:20 +01:00
wvengen
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +01:00
wvengen
5b6d1a66a6
complete show order i18n
...
Conflicts:
app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01:00
wvengen
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
wvengen
3b2d50b47d
make receive delta work when unit_quantity changes
2014-01-13 11:37:18 +01:00
wvengen
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
wvengen
90c81de872
update receive delta column + responsive css
2014-01-09 12:20:54 +01:00
wvengen
ce17bf33e0
complete and improve receive i18n
2014-01-08 13:39:49 +01:00
Julius
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
Julius
8479678530
Improve unlock button for receiving OrderArticles manually adjusted
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-04 20:51:42 +01:00
wvengen
133429720c
old price display tweaks
2014-01-03 14:11:50 +01:00
wvengen
438de97464
fix non-closed order display
2014-01-03 13:00:14 +01:00
wvengen
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
wvengen
014a62aa11
use disabled property for input and fix style
2014-01-03 10:59:42 +01:00
Julius
f230d39055
Merge price columns in receive form into one
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-03 10:36:57 +01:00
wvengen
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
wvengen
a439f26b67
ui design update
2014-01-02 22:30:04 +01:00
wvengen
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
wvengen
a501fac76f
helpers i18n
2013-04-10 17:29:06 +02:00
benni
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
benni
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
benni
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
benni
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
benni
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
Benjamin Meichsner
325d47b22f
Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
2009-02-11 15:23:59 +01:00
Benjamin Meichsner
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
Benjamin Meichsner
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
