Additional dev related exclusions in gitignore, small cleanups in old upgrade classes.

[fa-stable.git] / purchasing / includes / db / grn_db.inc

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index d3bed587e3c2bbdc65314ad1ca4bb6f8d1e5cfa1..62f29ed87d60766fe331530791281447ecc4f631 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -9,7 +9,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-//------------------- update average material cost ---------------------------------------------- 
+/*
+    Update average inventory item cost.
+*/
 function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false)
 {
        // probably this function should be optimized
@@ -40,27 +42,18 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
     // Skip negative inventory adjustment for case of adjust_only
     if (is_inventory_item($stock_id) && !$adj_only) 
         handle_negative_inventory($stock_id, $qty, $price_in_home_currency, $date);
-       
-       $sql = "SELECT mb_flag, material_cost, labour_cost, overhead_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'];
-       
-       //Price adjustment for manufactured item
-       if (!$adj_only && $myrow['mb_flag'] == 'M') 
-       {
-               //reduce overhead_cost and labour_cost from price as those will remain as is
-               $price_in_home_currency = $price_in_home_currency - $myrow['labour_cost'] - $myrow['overhead_cost'];
-       }
 
-       $cost_adjust = false;
+       $item = get_item($stock_id);
+       $avg_cost =  $item['material_cost'];
 
        $qoh = get_qoh_on_date($stock_id);
 
+       $cost_adjust = false;
+
        if ($adj_only)
        {
                if ($qoh > 0)
-                       $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /     $qoh;
+                       $avg_cost = ($qoh * $avg_cost + $qty * $price_in_home_currency) / $qoh;
        }
        else
        {
@@ -71,16 +64,17 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
                        $qoh = 0;
                }
                if ($qoh + $qty > 0)
-                       $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /     ($qoh + $qty);
+                       $avg_cost = ($qoh * $avg_cost + $qty * $price_in_home_currency) / ($qoh + $qty);
        }
 
        if ($cost_adjust) // Material_cost replaced with price
                adjust_deliveries($stock_id, $price_in_home_currency_, $date);
-       $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."
+
+       $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($avg_cost)."
                WHERE stock_id=".db_escape($stock_id);
 
        db_query($sql,"The cost details for the inventory item could not be updated");
-       return $material_cost;
+       return $avg_cost;
 }
 
 //-------------------------------------------------------------------------------------------------------------
@@ -123,9 +117,8 @@ function add_grn(&$po)
                                if ($clearing_act)
                                        $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $stock_gl_code["inventory_account"],
                                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-                                               $order_line->receive_qty * $order_line->taxfree_charge_price($po), $po->supplier_id, '', 0, 
-                                               $order_line->stock_id);
-                               update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price,
+                                           $order_line->taxfree_charge_value($po), $po->supplier_id, '', 0, $order_line->stock_id);
+                               update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price,
                                        $order_line->receive_qty, $date_);
                        }
                        //------------------------------------------------------------------------------------------------------
@@ -133,7 +126,7 @@ function add_grn(&$po)
                        {
                                /*This must be the first receipt of goods against this line */
                                /*Need to get the standard cost as it is now so we can process GL jorunals later*/
-                               $order_line->standard_cost = get_standard_cost($order_line->stock_id);
+                               $order_line->standard_cost = get_unit_cost($order_line->stock_id);
                        }
                        // Update the purchase data table
                        add_or_update_purchase_data($po->supplier_id, $order_line->stock_id, $order_line->price, 
@@ -149,14 +142,15 @@ function add_grn(&$po)
                        $po->line_items[$line_no]->grn_item_id = $grn_item;
                        /* Update location stock records - NB  a po cannot be entered for a service/kit parts done automatically */
                        add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
-                               $order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_price($po));
+                               $order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);         
 
                } /*quantity received is != 0 */
        } /*end of order_line loop */
 
        if ($clearing_act && $total != 0.0) {
+               $accs = get_supplier_accounts($po->supplier_id);
                $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $clearing_act,
-                       0, 0, -$total, null);
+                       $accs['dimension_id'], $accs['dimension2_id'], -$total, null);
        }
        $Refs->save(ST_SUPPRECEIVE, $grn, $po->reference);
 
@@ -262,7 +256,7 @@ function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date)
 function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false,
        $is_invoiced_only=false, $invoice_no=0, $begin="", $end="")
 {
-    $sql = "SELECT grn.*, grn_item.*,
+    $sql = "SELECT grn.*, grn_item.*, po_item.delivery_date as req_del_date,
                grn_item.quantity_inv".($invoice_no ? "-invoice_item.quantity" : '')."  quantity_inv,
        po_item.unit_price,
        po_item.act_price,
@@ -353,7 +347,7 @@ function read_grn_items_to_order($grn_batch, &$order)
 
                        $order->add_to_order($order->lines_on_order, $myrow["item_code"],
                                $myrow["qty_recd"],$myrow["description"], $myrow["unit_price"],$units,
-                               sql2date($myrow["delivery_date"]), $myrow["quantity_inv"],
+                               sql2date($myrow["req_del_date"]), $myrow["quantity_inv"],
                                $myrow["qty_recd"]);
 
                        $order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];