fix conflit

This commit is contained in:
Zin Lin Phyo
2017-08-31 18:07:05 +06:30
9 changed files with 189 additions and 10 deletions

View File

@@ -340,6 +340,7 @@ Rails.application.routes.draw do
post 'save_stock' => 'stock_checks#create', as:'stock_check_save'
get '/stock_checks/:id' => 'stock_checks#show'
post 'save_to_journal' => 'stock_checks#save_to_journal', as: 'save_to_journal'
post 'print_stock_check' => 'stock_checks#print_stock_check', as: 'print_stock_check'
# resources :stock_checks
resources :stock_journals
resources :inventory_definitions