Merge branch 'master' into cloud

2017-12-13 18:30:39 +06:30
parent b3b443735a 974c5df830
commit 6507ad1eb5
11 changed files with 114 additions and 27 deletions
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -37,7 +37,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 	          sale_item.qty = 1
 	          sale_item.unit_price = di["price"]
 	          sale_item.taxable_price = di["price"] * 1
-	          sale_item.is_taxable = 1
+	          sale_item.is_taxable = di["is_taxable"]
 	          sale_item.account_id = 0

 	          sale_item.price = di["price"] * 1