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 |
|
wvengen
|
b81f414ae5
|
finish finance/order_articles i18n + en translation
|
2013-03-08 23:35:50 +01:00 |
|
wvengen
|
2b03a15a9a
|
finish finance invoice i18n and en translation
|
2013-02-27 12:31:01 +01:00 |
|
wvengen
|
569cdce2db
|
finish finance controller i18n
|
2013-02-22 00:44:39 +01:00 |
|
Manuel Wiedenmann
|
0065c44b74
|
i18n finance ordergroups
|
2013-02-11 10:21:39 +07:00 |
|
Manuel Wiedenmann
|
d2cd5b2b02
|
i18n group order articles
|
2013-02-11 10:21:39 +07:00 |
|
Manuel Wiedenmann
|
640e9799aa
|
i18n financial_transactions + controller
|
2013-02-11 10:21:39 +07:00 |
|
Manuel Wiedenmann
|
8be93c33f8
|
i18n finance + controller
|
2013-02-10 15:05:31 +07:00 |
|