X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fitem_adjustments_ui.inc;h=bed25415d792eb190a52257fb787cef5cdbcd4cb;hb=fd11a3b500e79a3e98f7a3860f872cd31ce33113;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..bed25415 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,43 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
function display_order_header(&$order)
{
- global $table_style2;
+ global $Refs;
- start_table("width=70% $table_style2"); // outer table
- echo "
";
- echo ""; // inner table
+ start_outer_table(TABLESTYLE2, "width='70%'"); // 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
-
- date_row(_("Date:"), 'AdjDate');
+ date_row(_("Date:"), 'AdjDate', '', true);
- echo " "; // inner table
-
- echo " | ";
-
- echo ""; // inner table
- movement_types_list_row(_("Detail:"), 'type', null);
+ table_section(2, "50%");
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST));
if (!isset($_POST['Increase']))
$_POST['Increase'] = 1;
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
}
//---------------------------------------------------------------------------------
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%");
+ start_table(TABLESTYLE, "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);
$total = 0;
$k = 0; //row colour counter
+ $low_stock = $order->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']);
$id = find_submit('Edit');
foreach ($order->line_items as $line_no=>$stock_item)
{
@@ -77,18 +71,21 @@ 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);
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_decimal_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"),
+ delete_button_cell("Delete$line_no", _("Delete"),
_('Remove line from document'));
end_row();
}
@@ -101,9 +98,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 +113,52 @@ 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 (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);
- $_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"]);
+ $_POST['std_cost'] = price_decimal_format($item_info["standard_cost"], $dec2);
$_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']);
+ 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 +187,3 @@ function adjustment_options_controls()
//---------------------------------------------------------------------------------
-?>
\ No newline at end of file