diff --git a/app/models/sale.rb b/app/models/sale.rb
index 406664d4..7f8c2a65 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1514,7 +1514,7 @@ def self.get_wastes_and_spoilages(from,to,status)
               .joins("JOIN sale_items ON sales.sale_id = sale_items.sale_id" )
               .where("sales.receipt_date between ? and ? #{type}",from,to)
               .group("sales.receipt_no,sale_items.menu_category_code,sale_items.item_instance_code")
-              .order("sales.sale_id,sale_items.menu_category_name,sale_items.product_name")
+              .order("sales.sale_id,sale_items.qty desc,sale_items.menu_category_name,sale_items.product_name")
 end
 
 # def self.get_separate_tax(from,to,payment_method=nil)
diff --git a/app/models/shop.rb b/app/models/shop.rb
index c039ace4..75c30dd7 100755
--- a/app/models/shop.rb
+++ b/app/models/shop.rb
@@ -1,5 +1,5 @@
 class Shop < ApplicationRecord
-	ShopDetail = Shop.find_by_id(1)
+	#ShopDetail = Shop.find_by_id(1)
 
 	# Shop Image Uploader
   	mount_uploader :logo, ShopImageUploader