X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fitem_adjustments_ui.inc;h=53643ad9b679cf4b9890b17a58225d5e3e6d4f16;hb=1f1df7734d5568aafd7b35dbd91e295716fbb518;hp=66223fb4a4d20b482b4d219db5d3799908666294;hpb=fc449c48a8d4ba23bfb18318dff08746340a440c;p=fa-stable.git diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc index 66223fb4..53643ad9 100644 --- a/inventory/includes/item_adjustments_ui.inc +++ b/inventory/includes/item_adjustments_ui.inc @@ -50,24 +50,23 @@ function display_adjustment_items($title, &$order) display_heading($title); div_start('items_table'); - start_table(TABLESTYLE, "width='80%'"); + start_table(TABLESTYLE, "width='90%'"); if ($order->fixed_asset) { $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Unit Cost"), _("Initial Value"), ""); } else { - $th = array(_("Item Code"), _("Item Description"), _("Quantity"), + $th = array(_("Item Code"), _("Item Description"), _("QOH"), _("Quantity"), _("Unit"), _("Unit Cost"), _("Total"), ""); if ( count($order->line_items)) $th[] = ''; } - if ( count($order->line_items)) $th[] = ''; table_header($th); $total = 0; $k = 0; //row colour counter $low_stock = $order->check_qoh($_POST['StockLocation'], $_POST['AdjDate']); - $id = find_submit('Edit'); + $id = get_post('selected_id', find_submit('Edit')); foreach ($order->line_items as $line_no=>$stock_item) { @@ -86,7 +85,13 @@ function display_adjustment_items($title, &$order) 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)); + $dec = get_qty_dec($stock_item->stock_id); + if (!$order->fixed_asset) + { + $qoh = get_qoh_on_date($stock_item->stock_id, $_POST['StockLocation']); + qty_cell($qoh, false, $dec); + } + qty_cell($stock_item->quantity, false, $dec); label_cell($stock_item->units); amount_decimal_cell($stock_item->standard_cost); @@ -97,9 +102,16 @@ function display_adjustment_items($title, &$order) amount_cell($stock_item->standard_cost * $stock_item->quantity); if (!$order->fixed_asset) { - edit_button_cell("Edit$line_no", _("Edit"), _('Edit document line')); + if ($id == -1) + edit_button_cell("Edit$line_no", _("Edit"), _('Edit document line')); + else + label_cell(''); } - delete_button_cell("Delete$line_no", _("Delete"), _('Remove line from document')); + if ($id == -1) + delete_button_cell("Delete$line_no", _("Delete"), _('Remove line from document')); + else + label_cell(''); + end_row(); } else @@ -110,10 +122,13 @@ function display_adjustment_items($title, &$order) if ($id == -1) adjustment_edit_item_controls($order); - - label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=5", "align=right", 2); + $row = !$order->fixed_asset ? 6 : 5; + label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=$row", "align=right", 2); end_table(); + + if ($id != -1) + hidden('selected_id', $id); if ($low_stock) display_note(_("Marked items have insufficient quantities in stock as on day of adjustment."), 0, 1, "class='stockmankofg'"); div_end(); @@ -127,19 +142,20 @@ function adjustment_edit_item_controls(&$order, $line_no=-1) start_row(); $dec2 = 0; - $id = find_submit('Edit'); - if ($line_no != -1 && $line_no == $id) - { - $_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_decimal_format($order->line_items[$id]->standard_cost, $dec2); - $_POST['units'] = $order->line_items[$id]->units; + if ($line_no != -1) + { + if (find_submit('Edit') != -1) { + $_POST['stock_id'] = $order->line_items[$line_no]->stock_id; + $_POST['qty'] = qty_format($order->line_items[$line_no]->quantity, + $order->line_items[$line_no]->stock_id, $dec); + //$_POST['std_cost'] = price_format($order->line_items[$line_no]->standard_cost); + $_POST['std_cost'] = price_decimal_format($order->line_items[$line_no]->standard_cost, $dec2); + } + $_POST['units'] = $order->line_items[$line_no]->units; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); - label_cell($order->line_items[$id]->item_description, 'nowrap'); + label_cell($order->line_items[$line_no]->item_description, 'nowrap'); $Ajax->activate('items_table'); } else @@ -150,49 +166,55 @@ function adjustment_edit_item_controls(&$order, $line_no=-1) stock_costable_items_list_cells(null, 'stock_id', null, false, true); if (list_updated('stock_id')) { - $Ajax->activate('units'); - $Ajax->activate('qty'); - $Ajax->activate('std_cost'); - $Ajax->activate('std_cost_view'); - $Ajax->activate('initial_price'); + $Ajax->activate('items_table'); } - $item_info = get_item_edit_info($_POST['stock_id']); + } + + $item_info = get_item_edit_info(get_post('stock_id')); + if ($item_info) { $dec = $item_info['decimals']; - $_POST['qty'] = number_format2(0, $dec); $_POST['std_cost'] = price_decimal_format($item_info["material_cost"], $dec2); $_POST['units'] = $item_info["units"]; - } - + } else + $dec = 0; if ($order->fixed_asset) { hidden('qty', -1); qty_cell(1, false, 0); - } else - qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); - - label_cell($_POST['units'], '', 'units'); + } else { + $qoh = get_qoh_on_date(get_post('stock_id'), $_POST['StockLocation']); + qty_cell($qoh, false, $dec); + label_cell( text_input('qty', get_post('qty', '0'), 15, 15, '', 'class="amount active" dec='.$dec), "nowrap align=right"); + } + label_cell(get_post('units'), '', 'units'); if ($order->fixed_asset) { - /* TODO: check if this is a correct way of creating a fixed item - that still has to be submitted in the form */ hidden('std_cost'); label_cell($_POST['std_cost'], "nowrap align=right ", 'std_cost_view'); $price = get_purchase_value($_POST['stock_id']); amount_cell($price, false, '', 'initial_price'); } else { - //amount_cells(null, 'std_cost', $_POST['std_cost']); - amount_cells(null, 'std_cost', null, null, null, $dec2); + if (get_post('_qty_changed')) { + $Ajax->activate('items_table'); + set_focus(input_num('qty') >= 0 ? 'std_cost' : 'AddItem'); + } + if (input_num('qty') >= 0) + amount_cells(null, 'std_cost', null, null, null, $dec); + else { + hidden('std_cost'); + label_cell($_POST['std_cost'], "nowrap align=right"); + } label_cell(" "); } - if ($id != -1) + if ($line_no != -1) { button_cell('UpdateItem', _("Update"), _('Confirm changes'), ICON_UPDATE); button_cell('CancelItemChanges', _("Cancel"), _('Cancel changes'), ICON_CANCEL); hidden('LineNo', $line_no); - set_focus('qty'); + set_focus('qty'); } else {