Pull from master

README.md

@@ -203,6 +203,7 @@ Add Feature for Order and Reservation
 For Price 0 in receipt bill
 	2) settings/lookups => { type:show_price, name:Show Price, value:1 }
 
+
 For Price 0 in receipt bill
 	2) settings/lookups => { type:order_by, name:Order By, value:name }
 

app/controllers/origami/product_commissions_controller.rb

@@ -91,7 +91,7 @@ class Origami::ProductCommissionsController < BaseOrigamiController
     # @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take
      
     Commission.all.each do |com|
-      if com.product_code.include? @menu_item.item_code && com.active == true
+      if com.product_code.include? @menu_item.item_code && com.is_active == true
         @commission = Commission.find(com.id)
         break
       end

app/pdf/receipt_bill_a5_pdf.rb

@@ -650,4 +650,3 @@ class ReceiptBillA5Pdf < Prawn::Document
         return status
     end
 end
-

app/pdf/receipt_bill_pdf.rb

@@ -638,4 +638,3 @@ class ReceiptBillPdf < Prawn::Document
         return status
     end
 end
-