***********************************************************************/
//--------------------------------------------------------------------------------------
-function add_material_cost($stock_id, $qty, $date_)
+//Chaitanya : Added $advanced Parameter for Advanced Manufacturing\r
+function add_material_cost($stock_id, $qty, $date_, $advanced=false)\r
{
$m_cost = 0;
$result = get_bom($stock_id);
$standard_cost = get_standard_cost($bom_item['component']);
$m_cost += ($bom_item['quantity'] * $standard_cost);
}
+ $bom_cost = $m_cost;\r
+ \r
//$dec = user_price_dec();
//price_decimal_format($m_cost, $dec);
- $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
+ $sql = "SELECT material_cost, labour_cost, overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "\r
.db_escape($stock_id);
$result = db_query($sql);
$myrow = db_fetch($result);
$material_cost = $myrow['material_cost'];
+ \r
+ //Chaitanya : Upating material cost without considering labour, overhead costs results in invalid costing \r
+ if ($advanced)\r
+ {\r
+ //reduce overhead_cost and labour_cost from price as those will remain as is\r
+ $m_cost = $m_cost - $myrow['labour_cost'] - $myrow['overhead_cost'];\r
+ }\r
+ \r
//$qoh = get_qoh_on_date($stock_id, null, $date_);
$qoh = get_qoh_on_date($stock_id);
+ $cost_adjust = false;\r
if ($qoh < 0)
+ {\r
+ if ($qoh + $qty >= 0)\r
+ $cost_adjust = true;\r
$qoh = 0;
+ } \r
if ($qoh + $qty != 0)
$material_cost = ($qoh * $material_cost + $qty * $m_cost) / ($qoh + $qty);
- //$material_cost = round2($material_cost, $dec);
- $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost
- WHERE stock_id=".db_escape($stock_id);
+ //$material_cost = round2($material_cost, $dec);\r
+ \r
+ if ($advanced && $cost_adjust) // new 2010-02-10\r
+ adjust_deliveries($stock_id, $bom_cost, $date_); \r
+ \r
+ $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."\r
+ WHERE stock_id=".db_escape($stock_id);\r
db_query($sql,"The cost details for the inventory item could not be updated");
}
-function add_overhead_cost($stock_id, $qty, $date_, $costs)
+//Chaitanya : Added Adjustement Only Parameter\r
+function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false)\r
{
//$dec = user_price_dec();
//price_decimal_format($costs, $dec);
$qoh = get_qoh_on_date($stock_id);
if ($qoh < 0)
$qoh = 0;
- if ($qoh + $qty != 0)
- $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty);
+ if ($adj_only)\r
+ {\r
+ if ($qty != 0)\r
+ $costs = $qty * $costs;\r
+ if ($qoh>0)\r
+ $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh;\r
+ else //Chaitanya : Pass JV if qoh is 0/negative \r
+ {\r
+ global $Refs;\r
+\r
+ $id = get_next_trans_no(ST_JOURNAL);\r
+ $ref = $Refs->get_next(ST_JOURNAL);\r
+ \r
+ $stock_gl_code = get_stock_gl_code($stock_id);\r
+ $memo = "WO Overhead cost settlement JV for zero/negative respository of ".$stock_id;\r
+ //Reverse the inventory effect if $qoh <=0\r
+ add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, \r
+ $stock_gl_code["inventory_account"],\r
+ $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, \r
+ -$costs);\r
+ //GL Posting to inventory adjustment account\r
+ add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, \r
+ $stock_gl_code["adjustment_account"],\r
+ $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,\r
+ $costs);\r
+ \r
+ add_audit_trail(ST_JOURNAL, $id, $date_);\r
+ add_comments(ST_JOURNAL, $id, $date_, $memo);\r
+ $Refs->save(ST_JOURNAL, $id, $ref); \r
+ }\r
+ }\r
+ else\r
+ { \r
+ if ($qoh + $qty != 0) \r
+ $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty);\r
+ }\r
//$overhead_cost = round2($overhead_cost, $dec);
$sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)."
WHERE stock_id=".db_escape($stock_id);
db_query($sql,"The cost details for the inventory item could not be updated");
}
-function add_labour_cost($stock_id, $qty, $date_, $costs)
+//Chaitanya : Added Adjustement Only Parameter\r
+function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false)\r
{
//$dec = user_price_dec();
//price_decimal_format($costs, $dec);
$qoh = get_qoh_on_date($stock_id);
if ($qoh < 0)
$qoh = 0;
- if ($qoh + $qty != 0)
- $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty);
+ if ($adj_only)\r
+ {\r
+ if ($qty != 0)\r
+ $costs = $qty * $costs;\r
+ if ($qoh>0)\r
+ $labour_cost = ($qoh * $labour_cost + $costs) / $qoh; \r
+ else //Chaitanya : Pass JV if qoh is 0/negative \r
+ {\r
+ global $Refs;\r
+\r
+ $id = get_next_trans_no(ST_JOURNAL);\r
+ $ref = $Refs->get_next(ST_JOURNAL);\r
+ \r
+ $stock_gl_code = get_stock_gl_code($stock_id);\r
+ $memo = "WO labour cost settlement JV for zero/negative respository of ".$stock_id;\r
+ //Reverse the inventory effect if $qoh <=0\r
+ add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, \r
+ $stock_gl_code["inventory_account"],\r
+ $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, \r
+ -$costs);\r
+ //GL Posting to inventory adjustment account\r
+ add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, \r
+ $stock_gl_code["adjustment_account"],\r
+ $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,\r
+ $costs);\r
+ \r
+ add_audit_trail(ST_JOURNAL, $id, $date_);\r
+ add_comments(ST_JOURNAL, $id, $date_, $memo);\r
+ $Refs->save(ST_JOURNAL, $id, $ref); \r
+ }\r
+ }\r
+ else\r
+ { \r
+ if ($qoh + $qty != 0) \r
+ $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty);\r
+ }\r
//$labour_cost = round2($labour_cost, $dec);
$sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
WHERE stock_id=".db_escape($stock_id);
db_query($sql,"The cost details for the inventory item could not be updated");
}
-function add_issue_cost($stock_id, $qty, $date_, $costs)
+//Chaitanya : Added Adjustement Only Parameter\r
+function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false)\r
{
if ($qty != 0)
$costs /= $qty;
$qoh = get_qoh_on_date($stock_id);
if ($qoh < 0)
$qoh = 0;
- if ($qoh + $qty != 0)
- $material_cost = ($qty * $costs) / ($qoh + $qty);
+ if ($adj_only)\r
+ {\r
+ if ($qty != 0)\r
+ $costs = $qty * $costs;\r
+ if ($qoh>0)\r
+ $material_cost = $costs / $qoh;\r
+ else //Chaitanya : Pass JV if qoh is 0/negative \r
+ {\r
+ global $Refs;\r
+\r
+ $id = get_next_trans_no(ST_JOURNAL);\r
+ $ref = $Refs->get_next(ST_JOURNAL);\r
+ \r
+ $stock_gl_code = get_stock_gl_code($stock_id);\r
+ $memo = "WO Issue settlement JV for zero/negative respository of ".$stock_id;\r
+ //Reverse the inventory effect if $qoh <=0\r
+ add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, \r
+ $stock_gl_code["inventory_account"],\r
+ $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, \r
+ -$costs);\r
+ //GL Posting to inventory adjustment account\r
+ add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, \r
+ $stock_gl_code["adjustment_account"],\r
+ $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,\r
+ $costs);\r
+ \r
+ add_audit_trail(ST_JOURNAL, $id, $date_);\r
+ add_comments(ST_JOURNAL, $id, $date_, $memo);\r
+ $Refs->save(ST_JOURNAL, $id, $ref); \r
+ }\r
+ }\r
+ else\r
+ {\r
+ if ($qoh + $qty != 0) \r
+ $material_cost = ($qty * $costs) / ($qoh + $qty);\r
+ }\r
//$material_cost = round2($material_cost, $dec);
$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
.db_escape($material_cost)
$args->woid = 0;
hook_db_prewrite($args, ST_WORKORDER);
- add_material_cost($stock_id, $units_reqd, $date_);
+ //Chaitanya : Material cost should be added at time of production as per BOM at the time.\r
+ //add_material_cost($stock_id, $units_reqd, $date_);\r
$date = date2sql($date_);
$required = date2sql($required_by);
'date_', 'required_by', 'memo_'), $args);
hook_db_prewrite($args, ST_WORKORDER);
- add_material_cost($_POST['old_stk_id'], -$_POST['old_qty'], $date_);
- add_material_cost($stock_id, $units_reqd, $date_);
+ //Chaitanya: Material Cost to be calculated at production\r
+ //add_material_cost($_POST['old_stk_id'], -$_POST['old_qty'], $date_);\r
+ //add_material_cost($stock_id, $units_reqd, $date_);\r
$date = date2sql($date_);
$required = date2sql($required_by);
begin_transaction();
hook_db_prevoid(ST_WORKORDER, $woid);
- add_material_cost($_POST['stock_id'], -$_POST['quantity'], $_POST['date_']);
+ //Chaitanya : Cost calculation are affected only at time of production\r
+ //add_material_cost($_POST['stock_id'], -$_POST['quantity'], $_POST['date_']);\r
// delete the work order requirements
delete_wo_requirements($woid);
$work_order = get_work_order($woid);
if (!($work_order["type"] == WO_ADVANCED))
{
- $date = sql2date($work_order['date_']);
+ //Chaitanya : Removed WO costing from here. Handled in void_stock_move\r
+ //Reason - if BOM is changed since WO was executed then add_material_cost will result in incorrect costing as it is based on current BOM for material cost.\r
+ /*$date = sql2date($work_order['date_']);\r
$qty = $work_order['units_reqd'];
add_material_cost($work_order['stock_id'], -$qty, $date); // remove avg. cost for qty
$cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost
add_labour_cost($work_order['stock_id'], -$qty, $date, $cost);
$cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost
if ($cost != 0)
- add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost);
+ add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost);*/\r
$sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = "
.db_escape($woid);
{
// void everything inside the work order : issues, productions, payments
$date = sql2date($work_order['date_']);
- add_material_cost($work_order['stock_id'], -$work_order['units_reqd'], $date); // remove avg. cost for qty
+ \r
+ //Chaitanya : Removed WO costing from here. Handled in void_stock_move\r
+ //Reason - if BOM is changed since WO was executed then add_material_cost will result in incorrect costing as it is based on current BOM for material cost.\r
+ //add_material_cost($work_order['stock_id'], -$work_order['units_reqd'], $date); // remove avg. cost for qty\r
+ \r
$result = get_work_order_productions($woid); // check the produced quantity
$qty = 0;
while ($row = db_fetch($result))
{
- $qty += $row['quantity'];
+ //Chaitanya : Use native function for voiding\r
+ void_work_order_produce($row['id']);\r
+ \r
+ //Post voided entry if not prevoided explicitly\r
+ $void_entry = get_voided_entry(ST_MANURECEIVE, $row['id']);\r
+ if ($void_entry)\r
+ continue;\r
+ $memo_ = _("Voiding Work Order Trans # ").$woid;\r
+ add_audit_trail(ST_MANURECEIVE, $row['id'], today(), _("Voided.")."\n".$memo_);\r
+ add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_); \r
+ \r
+ /*$qty += $row['quantity'];\r
// clear the production record
- $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id'];
+ $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$row['id'];\r
db_query($sql, "Cannot void a wo production");
- void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves;
+ void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; */\r
}
- $result = get_additional_issues($woid); // check the issued quantities
+ //Chaitanya : Get all work order issues\r
+ //$result = get_additional_issues($woid); // check the issued quantities\r
+ $result = get_work_order_issues($woid);\r
$cost = 0;
$issue_no = 0;
while ($row = db_fetch($result))
{
- $std_cost = get_standard_cost($row['stock_id']);
+ //Chaitanya : Use native function for voiding\r
+ void_work_order_issue($row['issue_no']);\r
+ \r
+ //Post voided entry if not prevoided explicitly\r
+ $void_entry = get_voided_entry(ST_MANUISSUE, $row['issue_no']);\r
+ if ($void_entry)\r
+ continue;\r
+ $memo_ = _("Voiding Work Order Trans # ").$woid;\r
+ add_audit_trail(ST_MANUISSUE, $row['issue_no'], today(), _("Voided.")."\n".$memo_);\r
+ add_voided_entry(ST_MANUISSUE, $row['issue_no'], today(), $memo_); \r
+ \r
+ /*$std_cost = get_standard_cost($row['stock_id']);\r
$icost = $std_cost * $row['qty_issued'];
$cost += $icost;
if ($issue_no == 0)
// void the actual issue items and their quantities
$sql = "UPDATE ".TB_PREF."wo_issue_items SET qty_issued = 0 WHERE issue_id="
.db_escape($row['id']);
- db_query($sql,"A work order issue item could not be voided");
- }
- if ($issue_no != 0)
- void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves
- if ($cost != 0)
- add_issue_cost($work_order['stock_id'], -$qty, $date, $cost);
-
+ db_query($sql,"A work order issue item could not be voided");*/ \r
+ }\r
+ \r
+ //Chaitaya : Voiding each issue handles the \r
+ //if ($issue_no != 0)\r
+ //void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves \r
+ //if ($cost != 0)\r
+ //add_issue_cost($work_order['stock_id'], -$qty, $date, $cost);\r
+
+ //Chaitanya : Reverse the cost effects on $work_order['stock_id'] as adjustement\r
$cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost
if ($cost != 0)
- add_labour_cost($work_order['stock_id'], -$qty, $date, $cost);
+ //add_labour_cost($work_order['stock_id'], -$qty, $date, $cost);\r
+ add_labour_cost($work_order['stock_id'], 1, $date, -$cost, true);\r
$cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost
if ($cost != 0)
- add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost);
+ //add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost);\r
+ add_overhead_cost($work_order['stock_id'], 1, $date, -$cost, true);\r
$sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = "
.db_escape($woid);
projects / fa-stable.git / blobdiff