Two smaller fixes in security_area codes.

[fa-stable.git] / manufacturing / includes / db / work_orders_db.inc

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 8ca45b93ec15f362784e75fd6284ffa4390d601e..24754e4b1867611190464207f38983b97973f51a 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -20,16 +20,23 @@ 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);
        $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
                .db_escape($stock_id);
        $result = db_query($sql);
        $myrow = db_fetch($result);
        $material_cost =  $myrow['material_cost'];
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty <= 0)
                $material_cost = 0;
        else
-               $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
+       $material_cost = round2($material_cost, $dec);  
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
@@ -37,6 +44,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); 
        if ($qty != 0)
                $costs /= $qty;
        $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -45,10 +54,15 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs)
        $myrow = db_fetch($result);
        $overhead_cost =  $myrow['overhead_cost'];
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty <= 0)
                $overhead_cost = 0;
        else
-               $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /      ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /      ($qoh + $qty);
+       $overhead_cost = round2($overhead_cost, $dec);  
        $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)."
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
@@ -56,6 +70,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); 
        if ($qty != 0)
                $costs /= $qty;
        $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -64,10 +80,15 @@ function add_labour_cost($stock_id, $qty, $date_, $costs)
        $myrow = db_fetch($result);
        $labour_cost =  $myrow['labour_cost'];
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty <= 0)
                $labour_cost = 0;
        else
-               $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
+       $labour_cost = round2($labour_cost, $dec);      
        $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
@@ -82,11 +103,18 @@ 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();
+       $material_cost = price_decimal_format($material_cost, $dec); 
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty  <= 0)
                $material_cost = 0;
        else
-               $material_cost = ($qty * $costs) /      ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $material_cost = ($qty * $costs) /      ($qoh + $qty);
+       $material_cost = round2($material_cost, $dec);  
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
                .db_escape($material_cost)
                ." WHERE stock_id=".db_escape($stock_id);
@@ -96,7 +124,9 @@ function add_issue_cost($stock_id, $qty, $date_, $costs)
 function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
        $type, $date_, $required_by, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc)
 {
-       if (!($type == wo_types::advanced()))
+       global $Refs;
+
+       if (!($type == WO_ADVANCED))
                return add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc);
 
        begin_transaction();
@@ -115,9 +145,10 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 
        $woid = db_insert_id();
 
-       add_comments(systypes::work_order(), $woid, $required_by, $memo_);
+       add_comments(ST_WORKORDER, $woid, $required_by, $memo_);
 
-       references::save_last($wo_ref, systypes::work_order());
+       $Refs->save(ST_WORKORDER, $woid, $wo_ref);
+       add_audit_trail(ST_WORKORDER, $woid, $date_);
 
        commit_transaction();
 
@@ -145,7 +176,8 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id,
 
        db_query($sql, "could not update work order");
 
-       update_comments(systypes::work_order(), $woid, null, $memo_);
+       update_comments(ST_WORKORDER, $woid, null, $memo_);
+       add_audit_trail(ST_WORKORDER, $woid, $date_, _("Updated."));
 
        commit_transaction();
 }
@@ -163,7 +195,8 @@ function delete_work_order($woid)
        $sql = "DELETE FROM ".TB_PREF."workorders WHERE id=".db_escape($woid);
        db_query($sql,"The work order could not be deleted");
 
-       delete_comments(systypes::work_order(), $woid);
+       delete_comments(ST_WORKORDER, $woid);
+       add_audit_trail(ST_WORKORDER, $woid, $_POST['date_'], _("Canceled."));
 
        commit_transaction();
 }
@@ -173,7 +206,7 @@ function delete_work_order($woid)
 function get_work_order($woid, $allow_null=false)
 {
     $sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description As StockItemName,
-               ".TB_PREF."locations.location_name
+               ".TB_PREF."locations.location_name, ".TB_PREF."locations.delivery_address 
                FROM ".TB_PREF."workorders, ".TB_PREF."stock_master, ".TB_PREF."locations
                WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id
                AND     ".TB_PREF."locations.loc_code=".TB_PREF."workorders.loc_code
@@ -238,7 +271,8 @@ function release_work_order($woid, $releaseDate, $memo_)
        // create Work Order Requirements based on the bom
        create_wo_requirements($woid, $stock_id);
 
-       add_comments(systypes::work_order(), $woid, $releaseDate, $memo_);
+       add_comments(ST_WORKORDER, $woid, $releaseDate, $memo_);
+       add_audit_trail(ST_WORKORDER, $woid, $releaseDate,_("Released."));
 
        commit_transaction();
 }
@@ -278,7 +312,7 @@ function void_work_order($woid)
 {
        $work_order = get_work_order($woid);
 
-       if (!($work_order["type"] == wo_types::advanced()))
+       if (!($work_order["type"] == WO_ADVANCED))
        {
                begin_transaction();
 
@@ -287,10 +321,10 @@ function void_work_order($woid)
                db_query($sql, "The work order couldn't be voided");
 
                // void all related stock moves
-               void_stock_move(systypes::work_order(), $woid);
+               void_stock_move(ST_WORKORDER, $woid);
 
                // void any related gl trans
-               void_gl_trans(systypes::work_order(), $woid, true);
+               void_gl_trans(ST_WORKORDER, $woid, true);
 
                // clear the requirements units received
                void_wo_requirements($woid);