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

Resolve merge conflicts

Browse source
This commit is contained in:
Julius Rapp 2013-12-07 11:50:37 +01:00
commit 11117738ce
9 changed files with 126 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/stockit_helper.rb
View file

@ -7,11 +7,11 @@ module StockitHelper
def link_to_stock_change_reason(stock_change)
if stock_change.delivery_id
link_to t('.delivery'), supplier_delivery_path(stock_change.delivery.supplier, stock_change.delivery)
link_to Delivery.model_name.human, supplier_delivery_path(stock_change.delivery.supplier, stock_change.delivery)
elsif stock_change.order_id
link_to t('.order'), order_path(stock_change.order)
link_to Order.model_name.human, order_path(stock_change.order)
elsif stock_change.stock_taking_id
link_to t('.stock_taking'), stock_taking_path(stock_change.stock_taking)
link_to StockTaking.model_name.human, stock_taking_path(stock_change.stock_taking)
end
end