remove conflict

2018-05-03 17:43:12 +06:30
parent 66a1d0bdad a7721fb706
commit 16cb755f11
10 changed files with 979 additions and 623 deletions
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -206,7 +206,7 @@ class ReceiptBillPdf < Prawn::Document
                total_price   = item.price #item.qty*item.unit_price - comment for room charges
                price         = item.unit_price
                product_name  = item.product_name
-
+                total_qty    += item.qty

                y_position = cursor