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);
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_);
}
//------------------------------------------------------------------------------------------------------
{
/*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,
$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);
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,
$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"];