fixed conflict after merge with dev branch for report query updated

2019-11-27 14:09:16 +06:30
parent 98b74af6cf 47c12c6faa
commit a0b7557f06
75 changed files with 1509 additions and 1940 deletions
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -163,8 +163,6 @@ class Origami::SaleEditController < BaseOrigamiController
    #   end
    # end

-    sale.compute_by_sale_items(sale.total_discount, nil, order_source)
-
    ProductCommission.edit_product_commission(saleitemObj,sale.shop_code)
  end