From 569f3733188bdff8d7df940aa88eb425335f7276 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 11 Jun 2009 00:09:05 +0000 Subject: [PATCH] Small adjustments --- .../includes/db/work_order_produce_items_db.inc | 10 +++++----- manufacturing/includes/db/work_orders_db.inc | 6 +++--- manufacturing/includes/db/work_orders_quick_db.inc | 3 ++- manufacturing/work_order_costs.php | 3 ++- manufacturing/work_order_entry.php | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc index c9131df8..ef5640c3 100644 --- a/manufacturing/includes/db/work_order_produce_items_db.inc +++ b/manufacturing/includes/db/work_order_produce_items_db.inc @@ -37,19 +37,19 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) $id = db_insert_id(); + // ------------------------------------------------------------------------- + + work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, true); + + // ------------------------------------------------------------------------- // insert a +ve stock move for the item being manufactured // negative means "unproduce" or unassemble add_stock_move(29, $details["stock_id"], $id, $details["loc_code"], $date_, $memo_, $quantity, 0); - // update wo quantity and close wo if requested work_order_update_finished_quantity($woid, $quantity, $close_wo); - // ------------------------------------------------------------------------- - work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, true); - - // ------------------------------------------------------------------------- if ($memo_) add_comments(29, $id, $date_, $memo_); diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 09a402c8..1c4fe7e2 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -79,11 +79,11 @@ function add_issue_cost($stock_id, $qty, $date_, $costs) $myrow = db_fetch($result); $material_cost = $myrow['material_cost']; $qoh = get_qoh_on_date($stock_id, null, $date_); - if ($qoh <= 0) + if ($qoh + $qty <= 0) $material_cost = 0; else - $material_cost = ($qoh * $material_cost + $qty * $costs) / $qoh; - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost + $material_cost = ($qty * $costs) / ($qoh + $qty); + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+$material_cost WHERE stock_id='$stock_id'"; db_query($sql,"The cost details for the inventory item could not be updated"); } diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc index b1f9a6c7..52b50819 100644 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@ -125,7 +125,8 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced null, -$issue_cost); $issue_total += $issue_cost; } - add_issue_cost($stock_id, $units_reqd, $date_, $issue_total); + 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)) diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php index a4ebdf2e..0d68a3f9 100644 --- a/manufacturing/work_order_costs.php +++ b/manufacturing/work_order_costs.php @@ -103,6 +103,7 @@ function can_process() if (isset($_POST['process']) && can_process() == true) { + begin_transaction(); add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'], 0, 0, $wo_cost_types[$_POST['PaymentType']], -input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType']); $is_bank_to = is_bank_account($_POST['cr_acc']); @@ -116,7 +117,7 @@ if (isset($_POST['process']) && can_process() == true) add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'], $_POST['dim1'], $_POST['dim2'], $wo_cost_types[$_POST['PaymentType']], input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType']); - + commit_transaction(); meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']); } diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index 18abddb5..7977a59d 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -380,7 +380,7 @@ else wo_types_list_row(_("Type:"), 'type', null); } -if ($_POST['released'] == true) +if (get_post('released')) { hidden('stock_id', $_POST['stock_id']); hidden('StockLocation', $_POST['StockLocation']); @@ -433,7 +433,7 @@ else } -if ($_POST['released']) +if (get_post('released')) label_row(_("Released On:"),$_POST['released_date']); textarea_row(_("Memo:"), 'memo_', null, 40, 5); @@ -445,7 +445,7 @@ if (isset($selected_id)) echo ""; submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), true); - if (isset($_POST['released'])) + if (get_post('released')) { submit_cells('close', _("Close This Work Order"),'','',true); } -- 2.30.2