X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fwork_order_issue_ui.inc;h=7a2baacb143c8cc1d4936e73b4fc82c5ee15ab75;hb=d17c1c555babe58c33e854fafb9667d5e57ac8d9;hp=8508364eb62f12674d5484ccaf9460d42e3378fe;hpb=3aebde86793f495095e09160ebaae3e7b7040747;p=fa-stable.git diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc index 8508364e..7a2baacb 100644 --- a/manufacturing/includes/work_order_issue_ui.inc +++ b/manufacturing/includes/work_order_issue_ui.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/ui/items_cart.inc"); @@ -16,11 +25,11 @@ function add_to_issue(&$order, $new_item, $new_item_qty, $standard_cost) function display_issue_items($title, &$order) { - global $table_style, $path_to_root; + global $path_to_root; display_heading($title); div_start('items_table'); - start_table("$table_style width=80% colspan=7"); + start_table(TABLESTYLE, "width=80% colspan=7"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Unit Cost"), ''); if ( count($order->line_items)) $th[] = ''; @@ -48,7 +57,7 @@ function display_issue_items($title, &$order) edit_button_cell("Edit$line_no", _("Edit"), _('Edit document line')); - edit_button_cell("Delete$line_no", _("Delete"), + delete_button_cell("Delete$line_no", _("Delete"), _('Remove line from document')); end_row(); } @@ -80,7 +89,8 @@ function issue_edit_item_controls(&$order, $line_no=-1) $_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['std_cost'] = price_format($order->line_items[$id]->standard_cost); + $std_cost = $order->line_items[$id]->standard_cost; $_POST['units'] = $order->line_items[$id]->units; hidden('stock_id', $_POST['stock_id']); @@ -102,22 +112,26 @@ function issue_edit_item_controls(&$order, $line_no=-1) $item_info = get_item_edit_info($_POST['stock_id']); - $_POST['qty'] = qty_format(0, $_POST['stock_id'], $dec); - $_POST['std_cost'] = price_format($item_info["standard_cost"]); + $dec = $item_info["decimals"]; + $_POST['qty'] = number_format2(0, $dec); + //$_POST['std_cost'] = price_format($item_info["standard_cost"]); + $std_cost = $item_info["standard_cost"]; $_POST['units'] = $item_info["units"]; } qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); label_cell($_POST['units'], '', 'units'); - amount_cells(null, 'std_cost', $_POST['std_cost']); + //amount_cells(null, 'std_cost', $_POST['std_cost']); + hidden('std_cost', $std_cost); + amount_cell($std_cost); if ($id != -1) { - edit_button_cell('UpdateItem', _("Update"), - _('Confirm changes')); - edit_button_cell('CancelItemChanges', _("Cancel"), - _('Cancel changes')); + button_cell('UpdateItem', _("Update"), + _('Confirm changes'), ICON_UPDATE); + button_cell('CancelItemChanges', _("Cancel"), + _('Cancel changes'), ICON_CANCEL); hidden('LineNo', $line_no); set_focus('qty'); } @@ -135,9 +149,11 @@ function issue_edit_item_controls(&$order, $line_no=-1) function issue_options_controls() { + global $Refs; + echo "
"; start_table(); - ref_row(_("Reference:"), 'ref', '', references::get_next(28)); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(28)); if (!isset($_POST['IssueType'])) $_POST['IssueType'] = 0;