X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fitem_adjustments_ui.inc;h=8c115bd3df91034bb7f0760a98f9c7dcc7bf62a9;hb=1eb1440489a2ec9c1ff51473232daac941e727bb;hp=6d0a7740e866c506c23db675639af4edf363e555;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc index 6d0a7740..8c115bd3 100644 --- a/inventory/includes/item_adjustments_ui.inc +++ b/inventory/includes/item_adjustments_ui.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/ui/items_cart.inc"); @@ -19,26 +28,18 @@ function display_order_header(&$order) { global $table_style2; - start_table("width=70% $table_style2"); // outer table - echo ""; - echo ""; // inner table + start_outer_table("width=70% $table_style2"); // outer table + table_section(1); locations_list_row(_("Location:"), 'StockLocation', null); ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::inventory_adjustment())); - echo "
"; // inner table - - echo ""; - - echo ""; // inner table + table_section(2, "33%"); date_row(_("Date:"), 'AdjDate'); - echo "
"; // inner table + table_section(3, "33%"); - echo ""; - - echo ""; // inner table movement_types_list_row(_("Detail:"), 'type', null); if (!isset($_POST['Increase'])) @@ -46,10 +47,7 @@ function display_order_header(&$order) yesno_list_row(_("Type:"), 'Increase', $_POST['Increase'], _("Positive Adjustment"), _("Negative Adjustment")); - echo "
"; // inner table - - echo ""; - end_table(1); // outer table + end_outer_table(1); // outer table } //--------------------------------------------------------------------------------- @@ -62,7 +60,7 @@ function display_adjustment_items($title, &$order) div_start('items_table'); start_table("$table_style width=80%"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), - _("Unit"), _("Unit Cost"), _("Total")); + _("Unit"), _("Unit Cost"), _("Total"), ""); if ( count($order->line_items)) $th[] = ''; table_header($th); @@ -88,7 +86,7 @@ function display_adjustment_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(); } @@ -131,15 +129,15 @@ function adjustment_edit_item_controls(&$order, $line_no=-1) else { stock_costable_items_list_cells(null, 'stock_id', null, false, true); - if(isset($_POST['_stock_id_update'])) { + if (list_updated('stock_id')) { $Ajax->activate('units'); $Ajax->activate('qty'); $Ajax->activate('std_cost'); } $item_info = get_item_edit_info($_POST['stock_id']); - - $_POST['qty'] = qty_format(0, $_POST['stock_id'], $dec); + $dec = $item_info['decimals']; + $_POST['qty'] = number_format2(0, $dec); $_POST['std_cost'] = price_format($item_info["standard_cost"]); $_POST['units'] = $item_info["units"]; } @@ -152,10 +150,10 @@ function adjustment_edit_item_controls(&$order, $line_no=-1) 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'); }