diff --git a/application/models/Sale.php b/application/models/Sale.php index 63af16ec3..a58abc5d1 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -30,7 +30,7 @@ class Sale extends CI_Model $decimals = totals_decimals(); $sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT - . " THEN ROUND(sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.item_unit_price * sales_items.discount / 100), $decimals) " + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) " . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END'; $sales_tax = "ROUND(IFNULL(SUM(sales_items_taxes.sales_tax), 0), $decimals)"; @@ -156,7 +156,7 @@ class Sale extends CI_Model $decimals = totals_decimals(); $sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT - . " THEN ROUND(sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.item_unit_price * sales_items.discount / 100), $decimals) " + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) " . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END'; $sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)'; @@ -1139,7 +1139,7 @@ class Sale extends CI_Model $decimals = totals_decimals(); $sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT - . " THEN ROUND(sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.item_unit_price * sales_items.discount / 100), $decimals) " + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) " . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END'; $sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)'; diff --git a/application/models/reports/Summary_report.php b/application/models/reports/Summary_report.php index f2006d2b0..cf2643acb 100644 --- a/application/models/reports/Summary_report.php +++ b/application/models/reports/Summary_report.php @@ -24,7 +24,7 @@ abstract class Summary_report extends Report $decimals = totals_decimals(); $sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT - . " THEN ROUND(sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.item_unit_price * sales_items.discount / 100), $decimals) " + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) " . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END'; $sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)';