benni 620ec946f1 Merge branch 'master' into master-rails3-merging ... Conflicts: .gitignore .rbenv-version app/controllers/finance/balancing_controller.rb app/views/finance/balancing/_order_article_form.html.haml Fixed updating current price in finance balancing.		2012-12-11 10:32:59 +01:00
..
balancing	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
financial_transactions	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
group_order_articles	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
invoices	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
order_articles	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00
ordergroups	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
index.html.haml	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00