X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fwork_order_issue_ui.inc;h=87ecf5e5fcca3513e6b978f146dcd147e9f06e44;hb=e41b7b30847fa2889d67d4e418bb9819a85f065d;hp=531e9983a5186a61d4314399b3f98f388fc91fd0;hpb=720ad204a82f09737dcf8a990f1e96ce92d03bdd;p=fa-stable.git
diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc
index 531e9983..87ecf5e5 100644
--- a/manufacturing/includes/work_order_issue_ui.inc
+++ b/manufacturing/includes/work_order_issue_ui.inc
@@ -5,129 +5,127 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
//--------------------------------------------------------------------------------
-function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
+function add_to_issue(&$order, $new_item, $new_item_qty, $standard_cost)
{
- $already_on_order = 0;
-
- foreach ($order->line_items as $order_item)
- {
- if (strcasecmp($order_item->stock_id, $new_item) == 0)
- {
- $already_on_order = 1;
- display_error(_("For Part :") . $new_item . " " . "This item is already on this order. You can change the quantity ordered of the existing line if necessary.");
- }
- }
-
- if ($already_on_order != 1)
- {
- $order->add_to_cart($new_item, $new_item_qty, $standard_cost);
- } /* end of if not already on the order */
-}
-
-//--------------------------------------------------------------------------------
-
-function display_order_header(&$order)
-{
- display_wo_details($_SESSION['issue_items']->order_id);
- echo "
";
+ if ($order->find_cart_item($new_item))
+ display_error(_("For Part :") . $new_item . " " . "This item is already on this issue. You can change the quantity issued of the existing line if necessary.");
+ else
+ $order->add_to_cart (count($order->line_items), $new_item, $new_item_qty, $standard_cost);
}
-
//---------------------------------------------------------------------------------
-function display_adjustment_items($Title, &$order)
+function display_issue_items($title, &$order)
{
global $table_style, $path_to_root;
- display_heading($Title);
- start_table("$table_style colspan=7");
+ display_heading($title);
+ div_start('items_table');
+ start_table("$table_style width=80% colspan=7");
$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
- _("Unit"), _("Unit Cost"));
- table_header($th);
+ _("Unit"), _("Unit Cost"), '');
+ if ( count($order->line_items)) $th[] = '';
- $subtotal = 0;
+ table_header($th);
+// $total = 0;
$k = 0; //row colour counter
- foreach ($order->line_items as $stock_item)
+ $id = find_submit('Edit');
+ foreach ($order->line_items as $line_no=>$stock_item)
{
- if ($_GET['Edit'] != $stock_item->stock_id)
+// $total += ($stock_item->standard_cost * $stock_item->quantity);
+
+ if ($id != $line_no)
{
alt_table_row_color($k);
- label_cell("$stock_item->stock_id");
- label_cell($stock_item->item_description);
- qty_cell($stock_item_quantity);
- if (strlen($stock_item->units))
- label_cell($stock_item->units);
- else
- label_cell("");
+ view_stock_status_cell($stock_item->stock_id);
+ label_cell($stock_item->item_description);
+ qty_cell($stock_item->quantity, false, get_qty_dec($stock_item->stock_id));
+ label_cell($stock_item->units);
amount_cell($stock_item->standard_cost);
+// amount_cell($stock_item->standard_cost * $stock_item->quantity);
- edit_link_cell(SID . "Edit=$stock_item->stock_id");
- delete_link_cell(SID . "Delete=$stock_item->stock_id");
- end_row();
- }
- else
+ edit_button_cell("Edit$line_no", _("Edit"),
+ _('Edit document line'));
+ edit_button_cell("Delete$line_no", _("Delete"),
+ _('Remove line from document'));
+ end_row();
+ }
+ else
{
- adjustment_edit_item_controls($order, $stock_item->stock_id);
+ issue_edit_item_controls($order, $line_no);
}
}
- if (!isset($_GET['Edit']))
- adjustment_edit_item_controls($order);
+ if ($id == -1)
+ issue_edit_item_controls($order);
+
+// label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right");
end_table();
+ div_end();
}
//---------------------------------------------------------------------------------
-function adjustment_edit_item_controls(&$order, $stock_id=null)
+function issue_edit_item_controls(&$order, $line_no=-1)
{
+ global $Ajax;
start_row();
- if (isset($_GET['Edit']) && $stock_id != null)
+ $id = find_submit('Edit');
+ if ($line_no != -1 && $line_no == $id)
{
- if (!isset($_POST['stock_id']))
- $_POST['stock_id'] = $order->line_items[$stock_id]->stock_id;
- if (!isset($_POST['qty']) || ($_POST['qty'] == ""))
- $_POST['qty'] = $order->line_items[$stock_id]->quantity;
- if (!isset($_POST['std_cost']) || ($_POST['std_cost'] == ""))
- $_POST['std_cost'] = $order->line_items[$stock_id]->standard_cost;
-
- $_POST['units'] = $order->line_items[$stock_id]->units;
+ $_POST['stock_id'] = $order->line_items[$id]->stock_id;
+ $_POST['qty'] = qty_format($order->line_items[$id]->quantity,
+ $order->line_items[$id]->stock_id, $dec);
+ $_POST['std_cost'] = price_format($order->line_items[$id]->standard_cost);
+ $_POST['units'] = $order->line_items[$id]->units;
hidden('stock_id', $_POST['stock_id']);
label_cell($_POST['stock_id']);
- label_cell($order->line_items[$stock_id]->item_description);
+ label_cell($order->line_items[$id]->item_description);
+ $Ajax->activate('items_table');
}
else
{
- $wo_details = get_work_order($_SESSION['issue_items']->order_id);
-
- echo "