wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen ... Conflicts: app/assets/javascripts/application.js		2014-02-10 16:03:08 +01:00
..
balancing_controller.rb	Apply publish/subscribe for OrderArticle#create	2014-01-02 19:16:03 +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	fix i18n	2013-10-02 17:23:49 +02:00
invoices_controller.rb	finish finance controller i18n	2013-02-22 00:44:39 +01:00
ordergroups_controller.rb	Removed acts_as_paranoid. Implemented own version.	2013-03-16 17:57:38 +01:00