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
..
assets	Changed header to copy old foodsoft style.	2012-11-24 15:23:12 +01:00
controllers	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00
documents	Refactored pdf generation with newest prawn.	2012-10-02 02:50:48 +02:00
helpers	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	Fixed feedback.	2012-11-10 17:05:43 +01:00
models	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00
views	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00