***********************************************************************/
//--------------------------------------------------------------------------------------
-function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc)
+function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
+ $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc)
{
global $Refs;
begin_transaction();
+ $args = func_get_args();
+ $args = (object)array_combine(array('wo_ref', 'loc_code', 'units_reqd', 'stock_id',
+ 'type', 'date_', 'memo_', 'costs', 'cr_acc', 'labour', 'cr_lab_acc'), $args);
+ $args->woid = 0;
+ hook_db_prewrite($args, ST_WORKORDER);
// if unassembling, reverse the stock movements
if ($type == WO_UNASSEMBLY)
db_query($sql, "The work order requirements could not be added");
// insert a -ve stock move for each item
+ // Chaitanya: Updated to record price and cost as std_cost for work order issued item
+ $UnitCost = get_standard_cost($bom_item["component"]);
add_stock_move(ST_WORKORDER, $bom_item["component"], $woid,
- $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0);
+ $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, $UnitCost, 0, 1, $UnitCost);
+ }
+
+ // -------------------------------------------------------------------------
+ //Negative Stock Handling
+ $qoh = get_qoh_on_date($stock_id);
+ $cost_adjust = false;
+ if ($qoh < 0)
+ {
+ if ($qoh + $units_reqd >= 0)
+ $cost_adjust = true;
}
-
// -------------------------------------------------------------------------
+
+ //Negative Stock Handling First; Prior to add_stock_move
+ if ($cost_adjust)
+ adjust_deliveries($stock_id, get_standard_cost($stock_id), $date_);
+
+ // -------------------------------------------------------------------------
// insert a +ve stock move for the item being manufactured
add_stock_move(ST_WORKORDER, $stock_id, $woid, $loc_code, $date_,
// -------------------------------------------------------------------------
- work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, false, $costs, $cr_acc, $labour, $cr_lab_acc);
-
- // -------------------------------------------------------------------------
+ work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, 0, $costs, $cr_acc, $labour, $cr_lab_acc);
+
+ //--------------------------------------------------------------------------
add_comments(ST_WORKORDER, $woid, $date_, $memo_);
$Refs->save(ST_WORKORDER, $woid, $wo_ref);
add_audit_trail(ST_WORKORDER, $woid, $date_,_("Quick production."));
+
+ $args->woid = $woid;
+ hook_db_postwrite($args, ST_WORKORDER);
commit_transaction();
return $woid;
}
//--------------------------------------------------------------------------------------
-function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced=false, $costs=0, $cr_acc="", $labour=0, $cr_lab_acc="")
+function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced=0, $costs=0, $cr_acc="", $labour=0, $cr_lab_acc="")
{
global $wo_cost_types;
$result = get_bom($stock_id);
// credit all the components
$total_cost = 0;
+ //Chaitanya : capture the exact i.e. non-rounded cost to avoid rounding error amplification
+ $total_material_cost = 0;
while ($bom_item = db_fetch($result))
{
-
$bom_accounts = get_stock_gl_code($bom_item["component"]);
$bom_cost = $bom_item["ComponentCost"] * $units_reqd;
-
+
+ $memo = $bom_item["quantity"] ." * ".$bom_item["description"];
if ($advanced)
{
+ $memo = $date_.": ".$memo;
+ update_wo_requirement_issued($woid, $bom_item['component'], $bom_item["quantity"] * $units_reqd);
// insert a -ve stock move for each item
- add_stock_move(ST_WORKORDER, $bom_item["component"], $woid,
- $bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0);
+ // Chaitanya: Updated to record price and cost as std_cost for work order issued item
+ $UnitCost = get_standard_cost($bom_item["component"]);
+ add_stock_move(ST_MANURECEIVE, $bom_item["component"], $advanced,
+ $bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, $UnitCost, 0, 1, $UnitCost);
}
- $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $bom_accounts["inventory_account"], 0, 0,
- null, -$bom_cost);
-
+
+ //Chaitanya : Compatibility for Service Items
+ if (!is_service($bom_accounts["mb_flag"]))
+ $ivaccount = $bom_accounts["inventory_account"];
+ else
+ // $ivaccount = $bom_accounts["cogs_account"];
+ $ivaccount = $bom_accounts["assembly_account"]; // changed 2015.10.14 by Petros .
+ $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
+ $memo, -$bom_cost);
+ $total_material_cost += $bom_cost;
}
if ($advanced)
{
+ //Chaitanya: Material cost added at time of production as per BOM at the time and in adjustment mode.
+ add_material_cost($stock_id, $units_reqd, $date_, true);
+
+ // $wo = get_work_order($woid);
// also take the additional issues
+ // moved to work_order_issues_db.inc
+ /*
$res = get_additional_issues($woid);
- $wo = get_work_order($woid);
$issue_total = 0;
while ($item = db_fetch($res))
{
$standard_cost = get_standard_cost($item['stock_id']);
$issue_cost = $standard_cost * $item['qty_issued'] * $units_reqd / $wo['units_reqd'];
$issue = get_stock_gl_code($item['stock_id']);
- $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0,
- null, -$issue_cost);
+ $stockitem = get_item($item['stock_id']);
+ $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0,
+ $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);
$issue_total += $issue_cost;
}
if ($issue_total != 0)
add_issue_cost($stock_id, $units_reqd, $date_, $issue_total);
- $result = get_gl_wo_cost_trans($woid, WO_LABOUR);
- $lcost = 0;
- while ($row = db_fetch($result))
- $lcost += -$row['amount'];
+ */
+
+ // Logic moved to work_order_costs.php
+ /*
+ $lcost = get_gl_wo_cost($woid, WO_LABOUR);
add_labour_cost($stock_id, $units_reqd, $date_, $lcost * $units_reqd / $wo['units_reqd']);
- $result = get_gl_wo_cost_trans($woid, WO_OVERHEAD);
- $ocost = 0;
- while ($row = db_fetch($result))
- $ocost += -$row['amount'];
- add_overhead_cost($stock_id, $units_reqd, $date_, $ocost * $units_reqd / $wo['units_reqd']);
+ $ocost = get_gl_wo_cost($woid, WO_OVERHEAD);
+ add_overhead_cost($stock_id, $units_reqd, $date_, $ocost * $units_reqd / $wo['units_reqd']); */
}
// credit additional costs
$item_accounts = get_stock_gl_code($stock_id);
PT_WORKORDER, WO_LABOUR);
}
// debit total components $total_cost
- add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"],
- 0, 0, null, -$total_cost);
+ $stockitem = get_item($stock_id);
+ $memo = _("Produced")." ".$units_reqd. " * ".$stockitem["description"];
+ if ($advanced)
+ $memo = $date_.": ".$memo;
+ add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"],
+ 0, 0, $memo, -$total_cost);
+
+ //Chaitanya : Update cost of the manufactured item in stock moves table
+ if (!$advanced)
+ {
+ $UnitWOCost = ($total_material_cost + $costs + $labour)/$units_reqd;
+ update_stock_move(ST_WORKORDER, $woid, $stock_id, $UnitWOCost);
+ }
}
//--------------------------------------------------------------------------------------
projects / fa-stable.git / blobdiff