Pull from master

2018-04-05 11:49:42 +06:30
parent 9bf4047548
commit fc8b2d3b73
14 changed files with 222 additions and 54 deletions
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -472,7 +472,7 @@ class SalePayment < ApplicationRecord
      elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
        table_update_status(sObj)
        update_shift
-      elsif method_status && paid_amount.to_f == 0
+      elsif method_status && paid_amount.to_f == 0 && is_credit == 0
        table_update_status(sObj)
        update_shift
      end