Pull from master

This commit is contained in:
San Wai Lwin
2018-08-20 11:26:07 +06:30
parent 3c2faf5970
commit d1852d24c3
28 changed files with 464 additions and 216 deletions

View File

@@ -357,7 +357,7 @@ scope "(:locale)", locale: /en|mm/ do
post "/:id", to: "edit#update"
# Pass assigned_order_item_id
post 'print/print/:id', to: "print#print"
get 'print/print/:id', to: "print#print"
get 'print/print_order_summary/:id', to: "print#print_order_summary"
get "/get_items/:id" => "home#get_items_by_oqs", :as => "get_order_items_by_oqs"
@@ -513,6 +513,7 @@ scope "(:locale)", locale: /en|mm/ do
# resources :stock_checks
resources :stock_journals
resources :inventory_definitions
get ':inventory_definition_id/show' => 'inventory#show'
end
#mount_compendium at: '/report' #, controller: 'reports'