See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
//------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008
-
function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false)
{
+ // probably this function should be optimized
+ // passing transaction cart as argument. This would
+ // save a couple of db calls like get_supplier()
+
+ $supp = get_supplier($supplier);
if ($supplier != null)
- $currency = get_supplier_currency($supplier);
+ $currency = $supp['curr_code'];
else
$currency = null;
+
+ if ($supp['tax_included'])
+ $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'],
+ $supp['tax_included']);
+
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);
+
+ $price_in_home_currency_ = $price_in_home_currency;
+
+ //Handle if inventory will become negative
+ //8-OCT-2011 : 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')
+ {
+ $standard_cost = get_standard_cost($stock_id);
+ //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'];
+ }
+
if ($adj_only)
$exclude = ST_CUSTDELIVERY;
else
$exclude = 0;
- $qoh = get_qoh_on_date($stock_id, null, $date, $exclude);
+ $cost_adjust = false;
+
+ $qoh = get_qoh_on_date($stock_id);
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);
+ }
+ if ($cost_adjust) // new 2010-02-10 //Chaitanya : 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)."
WHERE stock_id=".db_escape($stock_id);
+
db_query($sql,"The cost details for the inventory item could not be updated");
return $material_cost;
}
//-------------------------------------------------------------------------------------------------------------
-function add_grn(&$po, $date_, $reference, $location)
+function add_grn(&$po)
{
global $Refs;
- begin_transaction();
+ $date_ = $po->orig_order_date;
- $grn = add_grn_batch($po->order_no, $po->supplier_id, $reference, $location, $date_);
+ begin_transaction();
+ hook_db_prewrite($po, ST_SUPPRECEIVE);
- foreach ($po->line_items as $order_line)
+ if (!is_company_currency($po->curr_code))
{
+ if (!$po->ex_rate)
+ $po->ex_rate = get_date_exchange_rate($po->curr_code, $date_);
+ else
+ add_new_exchange_rate($po->curr_code, $date_, $po->ex_rate);
+ } else
+ $po->ex_rate = 1;
+
+ $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_, $po->ex_rate);
+ $clearing_act = get_company_pref('grn_clearing_act');
+ if ($clearing_act) { // otherwise GRN clearing account is not used
+ $total = 0;
+ }
+ foreach ($po->line_items as $line_no => $order_line)
+ {
if ($order_line->receive_qty != 0 && $order_line->receive_qty != "" && isset($order_line->receive_qty))
{
+ $stock_gl_code = get_stock_gl_code($order_line->stock_id);
/*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_);
+ //------------------- update average material cost and clearing account ----- Joe Hunt Mar-03-2008
+ if (is_inventory_item($order_line->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->receive_qty, $date_);
+ }
//----------------------------------------------------------------------------------------------------------------
if ($order_line->qty_received == 0)
{
add_or_update_purchase_data($po->supplier_id, $order_line->stock_id, $order_line->price,
$order_line->item_description);
- /*Need to insert a grn item */
-
+ /*Need to insert a grn item */ // also need to check for over-receive.(within allowance)
+ if ($order_line->receive_qty + $order_line->qty_received > $order_line->quantity)
+ $order_line->quantity = $order_line->receive_qty + $order_line->qty_received;
$grn_item = add_grn_detail_item($grn, $order_line->po_detail_rec,
$order_line->stock_id, $order_line->item_description,
- $order_line->standard_cost, $order_line->receive_qty, $order_line->price);
+ $order_line->standard_cost, $order_line->receive_qty, $order_line->price, $order_line->quantity);
- /* 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_, "",
- $order_line->receive_qty, $order_line->standard_cost,
- $po->supplier_id, 1, $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,
+ $po->supplier_id, 1, $order_line->taxfree_charge_price($po));
} /*quantity received is != 0 */
} /*end of order_line loop */
- $Refs->save(ST_SUPPRECEIVE, $grn, $reference);
+ if ($clearing_act && $total != 0.0) {
+ $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $clearing_act,
+ 0, 0, -$total, null);
+ }
+ $Refs->save(ST_SUPPRECEIVE, $grn, $po->reference);
add_audit_trail(ST_SUPPRECEIVE, $grn, $date_);
+ $po->trans_no = $grn;
+ hook_db_postwrite($po, ST_SUPPRECEIVE);
commit_transaction();
return $grn;
//----------------------------------------------------------------------------------------
-function add_grn_batch($po_number, $supplier_id, $reference, $location, $date_)
+function add_grn_batch($po_number, $supplier_id, $reference, $location, $date_, $rate)
{
$date = date2sql($date_);
- $sql = "INSERT INTO ".TB_PREF."grn_batch (purch_order_no, delivery_date, supplier_id, reference, loc_code)
+ $sql = "INSERT INTO ".TB_PREF."grn_batch (purch_order_no, delivery_date, supplier_id, reference, loc_code, rate)
VALUES (".db_escape($po_number).", ".db_escape($date).", "
- .db_escape($supplier_id).", ".db_escape($reference).", ".db_escape($location).")";
+ .db_escape($supplier_id).", ".db_escape($reference).", ".db_escape($location).", ".db_escape($rate).")";
db_query($sql, "A grn batch record could not be inserted.");
//-------------------------------------------------------------------------------------------------------------
function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $description, $standard_unit_cost,
- $quantity_received, $price)
+ $quantity_received, $price, $quantity)
{
$sql = "UPDATE ".TB_PREF."purch_order_details
SET quantity_received = quantity_received + ".db_escape($quantity_received).",
std_cost_unit=".db_escape($standard_unit_cost).",
+ quantity_ordered=".db_escape($quantity).",
act_price=".db_escape($price)."
WHERE po_detail_item = ".db_escape($po_detail_item);
function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false,
$is_invoiced_only=false, $invoice_no=0, $begin="", $end="")
{
- $sql = "SELECT ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.*, "
- .TB_PREF."purch_order_details.unit_price,
- ".TB_PREF."purch_order_details.std_cost_unit, units
- FROM ".TB_PREF."grn_batch, ".TB_PREF."grn_items, "
- .TB_PREF."purch_order_details, ".TB_PREF."stock_master";
- if ($invoice_no != 0)
- $sql .= ", ".TB_PREF."supp_invoice_items";
- $sql .= " WHERE ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id
- AND ".TB_PREF."grn_items.po_detail_item=".TB_PREF."purch_order_details.po_detail_item";
- if ($invoice_no != 0)
- $sql .= " AND ".TB_PREF."supp_invoice_items.supp_trans_type=".ST_SUPPINVOICE." AND
- ".TB_PREF."supp_invoice_items.supp_trans_no=$invoice_no AND
- ".TB_PREF."grn_items.id=".TB_PREF."supp_invoice_items.grn_item_id";
- $sql .= " AND ".TB_PREF."stock_master.stock_id=".TB_PREF."grn_items.item_code ";
+ $sql = "SELECT grn.*, grn_item.*,
+ grn_item.quantity_inv".($invoice_no ? "-invoice_item.quantity" : '')." quantity_inv,
+ po_item.unit_price,
+ po_item.act_price,
+ po_item.quantity_ordered,
+ po_item.std_cost_unit, units
+ FROM ".TB_PREF."grn_batch grn, "
+ .TB_PREF."purch_order_details po_item, "
+ .TB_PREF."stock_master stock_item,"
+ .TB_PREF."grn_items grn_item ";
+
+ if ($invoice_no != 0) {
+ $sql .= " LEFT JOIN ".TB_PREF."supp_invoice_items invoice_item ON ";
+
+ $inv_cond = "invoice_item.supp_trans_type=".ST_SUPPINVOICE." AND invoice_item.supp_trans_no ";
+ if (is_array($invoice_no))
+ $inv_cond .= " IN (".implode(',' , $invoice_no) . ")";
+ else
+ $inv_cond .= " = $invoice_no";
+ $sql .= "($inv_cond) AND grn_item.id=invoice_item.grn_item_id";
+ }
+ $sql .= " WHERE grn_item.grn_batch_id=grn.id
+ AND grn_item.po_detail_item=po_item.po_detail_item";
+
+ if ($outstanding_only)
+ $sql .= " AND (".($invoice_no ? "$inv_cond OR ":'')."grn_item.qty_recd - grn_item.quantity_inv > 0)";
+
+ $sql .= " AND stock_item.stock_id=grn_item.item_code ";
if ($begin != "")
- $sql .= " AND ".TB_PREF."grn_batch.delivery_date>='".date2sql($begin)."'";
+ $sql .= " AND grn.delivery_date>='".date2sql($begin)."'";
if ($end != "")
- $sql .= " AND ".TB_PREF."grn_batch.delivery_date<='".date2sql($end)."'";
+ $sql .= " AND grn.delivery_date<='".date2sql($end)."'";
if ($grn_batch_id != 0)
- $sql .= " AND ".TB_PREF."grn_batch.id=".db_escape($grn_batch_id)
- ." AND ".TB_PREF."grn_items.grn_batch_id=".db_escape($grn_batch_id);
+ $sql .= " AND grn.id=".db_escape($grn_batch_id)
+ ." AND grn_item.grn_batch_id=".db_escape($grn_batch_id);
if ($is_invoiced_only)
- $sql .= " AND ".TB_PREF."grn_items.quantity_inv > 0";
-
- if ($outstanding_only)
- $sql .= " AND ".TB_PREF."grn_items.qty_recd - ".TB_PREF."grn_items.quantity_inv > 0";
+ $sql .= " AND grn_item.quantity_inv > 0";
if ($supplier_id != "")
- $sql .= " AND ".TB_PREF."grn_batch.supplier_id =".db_escape($supplier_id);
+ $sql .= " AND grn.supplier_id =".db_escape($supplier_id);
- $sql .= " ORDER BY ".TB_PREF."grn_batch.delivery_date, ".TB_PREF."grn_batch.id, ".TB_PREF."grn_items.id";
+ $sql .= " ORDER BY grn.delivery_date, grn.id, grn_item.id";
return db_query($sql, "Could not retreive GRNS");
}
while ($myrow = db_fetch($result))
{
-
+ if ($myrow['qty_recd'] == 0 && $myrow['quantity_inv'] == 0)
+ continue; // 2011-01-18 Joe Hunt. We will not have empty credited rows.
if (is_null($myrow["units"]))
{
$units = "";
$units = $myrow["units"];
}
- $order->add_to_order($order->lines_on_order+1, $myrow["item_code"],
- 1,$myrow["description"], $myrow["unit_price"],$units,
+ $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"],
$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
}
$row = db_fetch($result);
$po_number = $row["purch_order_no"];
+ $order->ex_rate = $row["rate"];
$result = read_po_header($po_number, $order);
if ($result)
{
+ $order->trans_type = ST_SUPPRECEIVE;
$order->orig_order_date = sql2date($row["delivery_date"]);
- $order->location = $row["loc_code"];
+ $order->Location = $row["loc_code"];
$order->reference = $row["reference"];
read_grn_items_to_order($grn_batch, $order);
return false;
begin_transaction();
+ hook_db_prevoid(ST_SUPPRECEIVE, $grn_batch);
void_bank_trans(ST_SUPPRECEIVE, $grn_batch, true);
void_gl_trans(ST_SUPPRECEIVE, $grn_batch, true);
//----------------------------------------------------------------------------------------------------------
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff