Commit Graph

7 Commits

Author SHA1 Message Date
Julius baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders 2014-01-02 19:14:41 +01:00
wvengen 1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +02:00
wvengen 7dbe1363ed fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125) 2013-06-24 13:32:07 +02:00
Benjamin Meichsner dd0bd0ad7e Fixed updating order article in stockit balancing. 2013-03-17 18:33:04 +01:00
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
benni af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni 467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00