fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30
parent da7dad05e4 b38e98a22a
commit ce8581f892
13 changed files with 147 additions and 83 deletions
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -44,7 +44,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 	          sale_item.product_code = "Other Charges"
 	          sale_item.product_name = "*" + di["name"]
 	          sale_item.product_alt_name = ""
-	          sale_item.remark = "Other Charges"
+	          sale_item.status = "Other Charges"

 	          sale_item.qty = 1
 	          sale_item.unit_price = di["price"]