Inventory Valuation Report showing 0 (zero) on Unit Cost and decimal precision fix.

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 52fafa53e690e785dd8b3bb845c2636a312ae6f2..23887cb65d62d995a7bfce41ba30e2b0c2d651dd 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -353,7 +353,7 @@ function price_decimal_format($number, &$dec)
        if ($pos !== false)
        {
                $len = strlen(substr($str, $pos + 1));
-               if ($len > $dec)
+               if ($len > $dec && $len < ini_get('precision')-3)
                        $dec = $len;
        }
        return number_format2($number, $dec);

diff --git a/reporting/rep301.php b/reporting/rep301.php
index ac6694923a02d2348866085aea3dfd2ab15cd738..4ef14f1ca9d4210d6f0129cfff93bb4b1b34db18 100644 (file)
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -62,7 +62,7 @@ function getAverageCost($stock_id, $location, $to_date)
                                LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type
                                LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no
                        WHERE stock_id=".db_escape($stock_id)."
-                       AND move.tran_date < '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
+                       AND move.tran_date <= '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
 
        if ($location != 'all')
                $sql .= " AND move.loc_code = ".db_escape($location);

diff --git a/reporting/rep308.php b/reporting/rep308.php
index 2187717734cbf67c68ebca1f2c9a100eef630bcf..a8bcccbe2cf5e9da8689be6b15f9ab7e775da236 100644 (file)
--- a/reporting/rep308.php
+++ b/reporting/rep308.php
@@ -111,7 +111,7 @@ function avg_unit_cost($stock_id, $location=null, $to_date)
                                LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type
                                LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no
                        WHERE stock_id=".db_escape($stock_id)."
-                       AND move.tran_date < '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
+                       AND move.tran_date <= '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
 
        if ($location != '')
                $sql .= " AND move.loc_code = ".db_escape($location);