Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm

2017-06-29 15:42:45 +06:30
parent 9305e0c4b4 fd857146e8
commit 3b9c16d8d5
38 changed files with 878 additions and 186 deletions
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -18,6 +18,7 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem.save
     @newsaleitem.qty = saleitemObj.qty * -1
     @newsaleitem.price = saleitemObj.price * -1
+     @newsaleitem.is_taxable = 0
     @newsaleitem.product_name = saleitemObj.product_name + " - void"
     @newsaleitem.save
   end