git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

major fix taxable price for sale and other sale and oqs

Browse Source
This commit is contained in:
Yan
2017-11-22 18:39:35 +06:30
parent 2cc8b820db
commit 6beb32348d
18 changed files with 105 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/origami/discounts_controller.rb
View File

@@ -40,10 +40,10 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item.product_alt_name = ""
sale_item.remark = "Discount"
sale_item.qty = 1
sale_item.unit_price = di["price"]
sale_item.qty = -1
sale_item.unit_price = di["price"] * -1
sale_item.taxable_price = di["price"]
sale_item.is_taxable = 0
sale_item.is_taxable = 1
sale_item.account_id = origin_sale_item.account_id
sale_item.price = di["price"]

6
app/controllers/origami/other_charges_controller.rb
View File

@@ -36,11 +36,11 @@ class Origami::OtherChargesController < BaseOrigamiController
sale_item.qty = 1
sale_item.unit_price = di["price"]
sale_item.taxable_price = 0
sale_item.is_taxable = 0
sale_item.taxable_price = di["price"] * 1
sale_item.is_taxable = 1
sale_item.account_id = 0
sale_item.price = di["price"]
sale_item.price = di["price"] * 1
sale_item.save
action_by = current_user.id