X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fitem_adjustments_ui.inc;h=66223fb4a4d20b482b4d219db5d3799908666294;hb=fc449c48a8d4ba23bfb18318dff08746340a440c;hp=61c9daf6eb207375dde24ad8dc7cb81b0522db99;hpb=71691d5a6dab476e070925dc078265f1aa8658f5;p=fa-stable.git diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc index 61c9daf6..66223fb4 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"); @@ -8,7 +17,7 @@ include_once($path_to_root . "/includes/ui/items_cart.inc"); function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost) { if ($order->find_cart_item($new_item)) - 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."); + display_error(_("For Part :") . $new_item . " " . "This item is already on this document. You can change the quantity on the existing line if necessary."); else $order->add_to_cart (count($order->line_items), $new_item, $new_item_qty, $standard_cost); } @@ -17,58 +26,47 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost) function display_order_header(&$order) { - global $table_style2; - - start_table("width=70% $table_style2"); // outer table - echo ""; - echo ""; // inner table - - locations_list_row(_("Location:"), 'StockLocation', null); - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::inventory_adjustment())); - - echo "
"; // inner table - - echo ""; - - echo ""; // inner table - - date_row(_("Date:"), 'AdjDate'); - - echo "
"; // inner table + global $Refs; - echo ""; + start_outer_table(TABLESTYLE2, "width='70%'"); // outer table + table_section(1); - echo ""; // inner table - movement_types_list_row(_("Detail:"), 'type', null); + locations_list_row(_("Location:"), 'StockLocation', null, false, false, $order->fixed_asset); + date_row(_("Date:"), 'AdjDate', '', true); - if (!isset($_POST['Increase'])) - $_POST['Increase'] = 1; - yesno_list_row(_("Type:"), 'Increase', $_POST['Increase'], - _("Positive Adjustment"), _("Negative Adjustment")); + table_section(2, "50%"); - echo "
"; // inner table + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST, null, array('location'=>get_post('StockLocation'), 'date'=>get_post('AdjDate'))), + false, ST_INVADJUST); - echo ""; - end_table(1); // outer table + end_outer_table(1); // outer table } //--------------------------------------------------------------------------------- function display_adjustment_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%"); - $th = array(_("Item Code"), _("Item Description"), _("Quantity"), - _("Unit"), _("Unit Cost"), _("Total")); + start_table(TABLESTYLE, "width='80%'"); + + if ($order->fixed_asset) { + $th = array(_("Item Code"), _("Item Description"), _("Quantity"), + _("Unit"), _("Unit Cost"), _("Initial Value"), ""); + } else { + $th = array(_("Item Code"), _("Item Description"), _("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'); foreach ($order->line_items as $line_no=>$stock_item) { @@ -77,19 +75,31 @@ function display_adjustment_items($title, &$order) if ($id != $line_no) { - alt_table_row_color($k); + if (in_array($stock_item->stock_id, $low_stock)) + start_row("class='stockmankobg'"); // notice low stock status + else + alt_table_row_color($k); + + if ($order->fixed_asset) + label_cell($stock_item->stock_id); + else + view_stock_status_cell($stock_item->stock_id); - 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_button_cell("Edit$line_no", _("Edit"), - _('Edit document line')); - edit_button_cell("Delete$line_no", _("Delete"), - _('Remove line from document')); + amount_decimal_cell($stock_item->standard_cost); + + if ($order->fixed_asset) { + $price = get_purchase_value($stock_item->stock_id); + amount_cell($price); + } else + amount_cell($stock_item->standard_cost * $stock_item->quantity); + + if (!$order->fixed_asset) { + edit_button_cell("Edit$line_no", _("Edit"), _('Edit document line')); + } + delete_button_cell("Delete$line_no", _("Delete"), _('Remove line from document')); end_row(); } else @@ -101,9 +111,11 @@ function display_adjustment_items($title, &$order) if ($id == -1) adjustment_edit_item_controls($order); - label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right"); + label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=5", "align=right", 2); end_table(); + if ($low_stock) + display_note(_("Marked items have insufficient quantities in stock as on day of adjustment."), 0, 1, "class='stockmankofg'"); div_end(); } @@ -114,48 +126,71 @@ function adjustment_edit_item_controls(&$order, $line_no=-1) global $Ajax; 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_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; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); - label_cell($order->line_items[$id]->item_description); + label_cell($order->line_items[$id]->item_description, 'nowrap'); $Ajax->activate('items_table'); } else { - stock_costable_items_list_cells(null, 'stock_id', null, false, true); - if(isset($_POST['_stock_id_update'])) { + if ($order->fixed_asset) + stock_disposable_fa_list_cells(null, 'stock_id', null, false, true, $order->line_items); + else + 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'); } $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_decimal_format($item_info["material_cost"], $dec2); $_POST['units'] = $item_info["units"]; } - qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); + 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'); - amount_cells(null, 'std_cost', $_POST['std_cost']); - label_cell(" "); + 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); + label_cell(" "); + } 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'); } @@ -184,4 +219,3 @@ function adjustment_options_controls() //--------------------------------------------------------------------------------- -?> \ No newline at end of file