Allow reuse of references previously used on voided documents.

[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 84a2f938ad83de9ecb9eeddf6fbefe2484ffa6e0..2e7053574d2f594691cf5d614efe3121a15d92f3 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -17,32 +17,47 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
                $currency = get_supplier_currency($supplier);
        else
                $currency = null;
+       $dec = user_price_dec();
+       price_decimal_format($price, $dec);
+       $price = round2($price, $dec);
        if ($currency != null)
-               $price_in_home_currency = to_home_currency($price, $currency, $date);
+       {
+               $ex_rate = get_exchange_rate_to_home_currency($currency, $date);
+               $price_in_home_currency = $price / $ex_rate;
+       }       
        else
                $price_in_home_currency = $price;
        $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'];
+       if ($price > -0.0001 && $price < 0.0001)
+               return $material_cost;
        if ($adj_only)
                $exclude = ST_CUSTDELIVERY;
        else
                $exclude = 0;
+       $cost_adjust = false;
        $qoh = get_qoh_on_date($stock_id, null, $date, $exclude);
-
        if ($adj_only)
        {
-               if ($qoh <= 0)
-                       $material_cost = 0;
-               else
+               if ($qoh > 0)
                        $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /     $qoh;
        }
-       elseif ($qoh + $qty <= 0)
-               $material_cost = 0;
        else
-               $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /     ($qoh + $qty);
-
+       {
+               if ($qoh < 0)
+               {
+                       if ($qoh + $qty > 0)
+                               $cost_adjust = true;
+                       $qoh = 0;
+               }
+               if ($qoh + $qty != 0)
+                       $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /     ($qoh + $qty);
+       }       
+       $material_cost = round2($material_cost, $dec);
+       if ($cost_adjust) // new 2010-02-10
+               adjust_deliveries($stock_id, $material_cost, $date);
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
@@ -51,22 +66,23 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 
 //-------------------------------------------------------------------------------------------------------------
 
-function add_grn(&$po, $date_, $reference, $location)
+function add_grn(&$po)
 {
        global $Refs;
 
+       $date_ = $po->orig_order_date;
+
        begin_transaction();
 
-       $grn = add_grn_batch($po->order_no, $po->supplier_id, $reference, $location, $date_);
+       $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_);
 
-       foreach ($po->line_items as $order_line)
+       foreach ($po->line_items as $line_no => $order_line)
        {
 
                if ($order_line->receive_qty != 0 && $order_line->receive_qty != "" && isset($order_line->receive_qty))
                {
 
                        /*Update sales_order_details for the new quantity received and the standard cost used for postings to GL and recorded in the stock movements for FIFO/LIFO stocks valuations*/
-
                        //------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008
                        update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price,
                                $order_line->receive_qty, $date_);
@@ -87,15 +103,16 @@ function add_grn(&$po, $date_, $reference, $location)
                                $order_line->stock_id, $order_line->item_description,
                                $order_line->standard_cost,     $order_line->receive_qty, $order_line->price);
 
+                       $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 */
-            add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $location, $date_, "",
+            add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
                $order_line->receive_qty, $order_line->standard_cost,
                $po->supplier_id, 1, $order_line->price);
 
                } /*quantity received is != 0 */
        } /*end of order_line loop */
 
-       $Refs->save(ST_SUPPRECEIVE, $grn, $reference);
+       $Refs->save(ST_SUPPRECEIVE, $grn, $po->reference);
 
        add_audit_trail(ST_SUPPRECEIVE, $grn, $date_);
 
@@ -271,12 +288,12 @@ function read_grn_items_to_order($grn_batch, &$order)
                                $units = $myrow["units"];
                        }
 
-                       $order->add_to_order($order->lines_on_order+1, $myrow["item_code"],
+                       $order->add_to_order($order->lines_on_order, $myrow["item_code"],
                                1,$myrow["description"], $myrow["unit_price"],$units,
                                sql2date($myrow["delivery_date"]), $myrow["quantity_inv"],
                                $myrow["qty_recd"]);
 
-                       $order->line_items[$order->lines_on_order]->po_detail_rec = $myrow["po_detail_item"];
+                       $order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];
                } /* line po from purchase order details */
        } //end of checks on returned data set
 }