fixed conflict

app/models/sale.rb

@@ -263,4 +263,8 @@ class Sale < ApplicationRecord
   def generate_custom_id
     self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL")
   end
+
+  def self.get_receipt_no_list(from,to)
+    sale = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from,to)
+  end
 end