remove conflict data

app/controllers/origami/payments_controller.rb

@@ -60,6 +60,12 @@ class Origami::PaymentsController < BaseOrigamiController
           end
         end
         #end rounding adjustment
+      #record for sale audit
+      action_by = current_user.name
+      type = "FIRST_BILL"
+      
+      remark = "#{action_by} print out first bill for Receipt No #{sale_data.receipt_no}"
+      sale_audit = SaleAudit.record_audit_sale(sale_id,remark,action_by,type )
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate