Pull from master

config/locales/en.yml

@@ -84,6 +84,8 @@ en:
   processed: "Processed"
   delivery_details: "Delivery Details"
   credits: "Credits"
+  track: "Track"
+  debit: "Debit"
   
   views:
     btn:
@@ -494,6 +496,7 @@ en:
         in_time: "In Time"
         out_time: "Out Time"
         transaction_fee: "Transaction Fee"
+        checked_by: "Checked By"
         
         code_txt: "code "
         charge_txt: "charge"

config/locales/mm.yml

@@ -79,7 +79,9 @@ mm:
   processed: "Processed"
   delivery_details: "Delivery Details"
   credits: "အကြွေးများ"
-
+  track: "Track"
+  debit: "Debit"
+  
   views:
     btn:       
       create: "အသစ်တည်ဆောက်ရန်"
@@ -488,6 +490,7 @@ mm:
         in_time: "In Time"
         out_time: "Out Time"
         transaction_fee: "Transaction Fee"
+        checked_by: "Checked By"
         
         code_txt: "ကုတ်ဒ် "
         charge_txt: "ကောက်ခံသည်"

config/routes.rb

@@ -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'