4863: Dimension not defaulted on po entry, po modify. @Braath Waate and @joe fixed

[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..065b2c7d04fa0162df19529e402d9282c09d5fa4 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -41,18 +41,11 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
     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);
+       $sql = "SELECT mb_flag, 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'];
        
-       //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;
 
        $qoh = get_qoh_on_date($stock_id);
@@ -123,9 +116,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 +125,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 +141,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);