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
..
balancing_controller.rb	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
base_controller.rb	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
financial_transactions_controller.rb	i18n financial_transactions + controller	2013-02-11 10:21:39 +07:00
group_order_articles_controller.rb	Simplifiying balancing view part 2. Lets call it finished.	2012-07-27 18:03:46 +02:00
invoices_controller.rb	finish finance controller i18n	2013-02-22 00:44:39 +01:00
order_articles_controller.rb	Fixed updating order article in stockit balancing.	2013-03-17 18:33:04 +01:00
ordergroups_controller.rb	Removed acts_as_paranoid. Implemented own version.	2013-03-16 17:57:38 +01:00