Removed all decimal roundings in cost price calculations

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7bc0698613c6c162ee54e1ad6db0cca82e25e216..4909b54f7cb20397f6e8d71d3b53aa989ea67166 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+07-Sep-2010 Joe Hunt/Chaitanya
+! Removed all decimal roundings in cost price calculations
+$ /purchasing/includes/db/grn_db.inc
+  /manufacturing/includes/db/work_orders_db.inc
+  
 06-Sep-2010 Janusz Dobrowolski
 # Fixed error on new contact add.
 $ /includes/ui/contacts_view.inc

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 4a442a8b6a3ecff0dc31ceddae0c5193bbae79eb..830b33b90ff217765fe8893301979beb4c18aadb 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -20,8 +20,8 @@ function add_material_cost($stock_id, $qty, $date_)
                $standard_cost = get_standard_cost($bom_item['component']);
                $m_cost += ($bom_item['quantity'] * $standard_cost);
        }
-       $dec = user_price_dec();
-       price_decimal_format($m_cost, $dec);
+       //$dec = user_price_dec();
+       //price_decimal_format($m_cost, $dec);
        $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
                .db_escape($stock_id);
        $result = db_query($sql);
@@ -41,8 +41,8 @@ function add_material_cost($stock_id, $qty, $date_)
 
 function add_overhead_cost($stock_id, $qty, $date_, $costs)
 {
-       $dec = user_price_dec();
-       price_decimal_format($costs, $dec); 
+       //$dec = user_price_dec();
+       //price_decimal_format($costs, $dec); 
        if ($qty != 0)
                $costs /= $qty;
        $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -64,8 +64,8 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs)
 
 function add_labour_cost($stock_id, $qty, $date_, $costs)
 {
-       $dec = user_price_dec();
-       price_decimal_format($costs, $dec); 
+       //$dec = user_price_dec();
+       //price_decimal_format($costs, $dec); 
        if ($qty != 0)
                $costs /= $qty;
        $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -94,8 +94,8 @@ function add_issue_cost($stock_id, $qty, $date_, $costs)
        $result = db_query($sql);
        $myrow = db_fetch($result);
        $material_cost =  $myrow['material_cost'];
-       $dec = user_price_dec();
-       price_decimal_format($material_cost, $dec); 
+       //$dec = user_price_dec();
+       //price_decimal_format($material_cost, $dec); 
        //$qoh = get_qoh_on_date($stock_id, null, $date_);
        $qoh = get_qoh_on_date($stock_id);
        if ($qoh < 0)

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index a73efa6fcc3e20a36384adb62991815bd5ce71d2..344677eadb145cd0708f2a37c381b7a1a3a94983 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -26,9 +26,9 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
                $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'],
                        $supp['tax_included']);
 
-       $dec = user_price_dec();
-       price_decimal_format($price, $dec);
-       $price = round2($price, $dec);
+       //$dec = user_price_dec();
+       //price_decimal_format($price, $dec);
+       //$price = round2($price, $dec);
        if ($currency != null)
        {
                $ex_rate = get_exchange_rate_to_home_currency($currency, $date);