507651f5ba
Move small close button to helper.
...
Workaround for show order deface override nuking attributes of the close button.
2015-04-10 18:58:51 +02:00
699be6a6d9
introduce new layout in balancing article screen as well
2013-12-23 16:11:14 +01:00
3f497e9274
allow more than two columns in horizontal form
2013-12-10 23:41:45 +01:00
85b6ff908b
make new article dialog more responsive
2013-12-10 16:41:26 +01:00
58de1a231b
update price during editing as well
2013-12-10 13:30:15 +01:00
62ca3cb634
small layout cleanup [ci skip]
2013-12-06 14:49:13 +01:00
2f10210c76
remove unimplemented unit_divide box
2013-12-06 14:38:28 +01:00
c99aa7aab6
add availability to article edit dialog
2013-12-06 14:33:51 +01:00
923b579bd1
Merge branch 'master' into article-dialog
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-06 14:26:50 +01:00
1c4b9591a2
fix edit article dialog title
2013-12-06 12:34:14 +01:00
05b934e79f
update fc price dynamically in article edit form
2013-12-06 12:19:13 +01:00
84191ddcd0
first shot on improving edit article form
...
(see also foodcoops#209)
2013-11-20 23:46:11 +01:00
9753e6db00
Resolve merge conflicts with i18n
2013-06-10 20:05:47 +02:00
ff343933dd
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views
2013-06-07 09:49:32 +02:00
0f4614eb31
Add percent sign for tax in forms
2013-06-06 17:58:02 +02:00
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
4966aae0ad
Fixed modal forms. Submit form when hitting enter.
2013-04-08 14:27:23 +02:00
cb537bc11c
start articles i18n
2013-03-09 00:40:07 +01:00
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
3f133bb8c3
Added client side validations. Fixed shared sync.
2011-05-19 22:35:13 +02:00
9388e918a7
Implemented fancy box for ajax forms. Refactored articles modul.
2011-05-18 17:37:10 +02:00
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
936e6ef69a
Refactoring of articles and article_categories. articles are now a nested resource of supplier.
2009-01-16 16:19:26 +01:00
wvengen
Julius
Benjamin Meichsner
Benjamin Meichsner