remove conflict data

2018-02-27 14:35:21 +06:30
parent 3e0943275f 4d556cff43
commit adefd8c034
49 changed files with 1989 additions and 363 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -393,6 +393,7 @@ scope "(:locale)", locale: /en|mm/ do
    resources :commission, :only => [:index, :show]
    resources :stock_check, :only => [:index, :show]
    resources :payment_method
+    resources :product_sale, :only => [:index, :show]

    get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
  end