Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into master-rails3-merging

Browse source 
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.
This commit is contained in:
benni 2012-12-11 10:32:59 +01:00
commit 620ec946f1
7 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/finance/order_articles_controller.rb
View file

@ -26,7 +26,7 @@ class Finance::OrderArticlesController < ApplicationController
@order = Order.find(params[:order_id])
@order_article = OrderArticle.find(params[:id])
begin
@order_article.update_article_and_price!(params[:article], params[:price], params[:order_article])
@order_article.update_article_and_price!(params[:article], params[:article_price], params[:order_article])
rescue
render action: :edit
end