***********************************************************************/
//--------------------------------------------------------------------------------------
-function add_material_cost($stock_id, $qty, $date_, $advanced=false)
+function add_material_cost($stock_id, $qty, $date_, $advanced=false, $woid=0)
{
$m_cost = 0;
$result = get_bom($stock_id);
$m_cost += ($bom_item['quantity'] * $standard_cost);
}
$bom_cost = $m_cost;
-
+ // new Joe Hunt 2015.10.15
+ // additilnal costs.
+ $i_cost = 0;
+ if ($woid != 0 && work_order_has_issues($woid))
+ {
+ $res = get_additional_issues($woid);
+ while ($issue = db_fetch($res))
+ {
+ $standard_cost = get_standard_cost($issue['stock_id']);
+ $i_cost += ($issue['qty_issued'] * $standard_cost) / $qty;
+ }
+ }
$sql = "SELECT 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'];
-
+ $material_cost = $myrow['material_cost'] - $i_cost; // $i_cost was already added to material cost
+ $m_cost += $i_cost;
+ /* no, why will we do that?? Joe Hunt 2015.10.17
if ($advanced)
{
//reduce overhead_cost and labour_cost from price as those will remain as is
$m_cost = $m_cost - $myrow['labour_cost'] - $myrow['overhead_cost'];
}
-
+ */
$qoh = get_qoh_on_date($stock_id);
$cost_adjust = false;
if ($qoh < 0)
$qoh = 0;
if ($adj_only)
{
- if ($qty != 0)
- $costs = $qty * $costs;
if ($qoh>0)
- $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh;
+ {
+ if ($qoh + $qty != 0)
+ $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty);
+ elseif ($qty == 0)
+ $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh;
+ }
else // Journal Entry if QOH is 0/negative
{
global $Refs;
-$costs);
//GL Posting to inventory adjustment account
add_gl_trans_std_cost(ST_JOURNAL, $id, $date_,
- $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
+ $stock_gl_code["assembly_account"],
$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
$costs);
$qoh = 0;
if ($adj_only)
{
- if ($qty != 0)
- $costs = $qty * $costs;
if ($qoh>0)
- $labour_cost = ($qoh * $labour_cost + $costs) / $qoh;
+ {
+ if ($qoh + $qty != 0)
+ $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty);
+ elseif ($qty == 0)
+ $labour_cost = ($qoh * $labour_cost + $costs) / $qoh;
+ }
else // Journal Entry if QOH is 0/negative
{
global $Refs;
-$costs);
//GL Posting to inventory adjustment account
add_gl_trans_std_cost(ST_JOURNAL, $id, $date_,
- $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
+ $stock_gl_code["assembly_account"],
$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
$costs);
$qoh = 0;
if ($adj_only)
{
- if ($qty != 0)
- $costs = $qty * $costs;
if ($qoh>0)
- $material_cost = $costs / $qoh;
+ $material_cost = ($qoh * $material_cost + $costs) / $qoh;
else // Journal Entry if QOH is 0/negative
{
global $Refs;
-$costs);
//GL Posting to inventory adjustment account
add_gl_trans_std_cost(ST_JOURNAL, $id, $date_,
- $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
+ $stock_gl_code["assembly_account"],
$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
$costs);
else
{
if ($qoh + $qty != 0)
- $material_cost = ($qty * $costs) / ($qoh + $qty);
+ $material_cost = ($qoh * $material_cost + $qty * $costs) / ($qoh + $qty);
}
- $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
+ $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");