mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-23 08:21:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3107 from opensourcepos/fix_discounted_sales_rounding

Browse Source 
Fix discounted price rounding issues in reports reported in  #2995
This commit is contained in:
FrancescoUK
2021-02-14 06:41:19 +00:00
committed by GitHub
parent 4edc44a816 7a4cf1e2bd
commit da17d536ee
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/libraries/Sale_lib.php
View File

@@ -1270,6 +1270,10 @@ class Sale_lib
{
$discount = bcmul($total, bcdiv($discount, 100));
}
else
{
$discount = bcmul($quantity, $discount);
}
return round($discount, totals_decimals(), PHP_ROUND_HALF_UP);
}

14
application/models/Sale.php
View File

@@ -29,7 +29,9 @@ class Sale extends CI_Model
$decimals = totals_decimals();
$sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END';
$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) "
. '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)";
$internal_tax = "ROUND(IFNULL(SUM(sales_items_taxes.internal_tax), 0), $decimals)";
@@ -153,7 +155,10 @@ class Sale extends CI_Model
$decimals = totals_decimals();
$sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END';
$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) "
. '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)';
$tax = 'IFNULL(SUM(sales_items_taxes.tax), 0)';
@@ -1133,7 +1138,10 @@ class Sale extends CI_Model
$decimals = totals_decimals();
$sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END';
$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) "
. '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)';
$tax = 'IFNULL(SUM(sales_items_taxes.tax), 0)';

5
application/models/reports/Summary_report.php
View File

@@ -23,7 +23,10 @@ abstract class Summary_report extends Report
$decimals = totals_decimals();
$sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END';
$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) "
. '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)';
$tax = 'IFNULL(SUM(sales_items_taxes.tax), 0)';