remove conflict data

2018-07-12 15:54:30 +06:30
parent 03abeabb4e eef4af4cc6
commit dd4db6d2e7
20 changed files with 67 additions and 29 deletions
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -42,8 +42,9 @@ class Origami::CreditPaymentsController < BaseOrigamiController
      # end

      saleObj = Sale.find(sale_id)
+      remark = "credit payment for Receipt No #{saleObj.receipt_no}"
      sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "creditnote")
+      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "creditnote",remark)
    end
  end