X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fstock_transfers_ui.inc;h=acc17772b75daf62c54a05be677cafcecc3da01c;hb=27610a5a7a22cafffa960dbfd795f33f33c78dc2;hp=63d7c970d8148b79e6b3dd9edc0a880933baa973;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git
diff --git a/inventory/includes/stock_transfers_ui.inc b/inventory/includes/stock_transfers_ui.inc
index 63d7c970..acc17772 100644
--- a/inventory/includes/stock_transfers_ui.inc
+++ b/inventory/includes/stock_transfers_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,68 +26,62 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
function display_order_header(&$order)
{
- global $table_style;
-
- start_table("width=70% $table_style");
- echo "
"; // outer table
- echo "";
-
- locations_list_row(_("From Location:"), 'FromStockLocation', null);
- locations_list_row(_("To Location:"), 'ToStockLocation', null);
-
- echo " ";
-
- echo " | "; // outer table
+ global $Refs;
- echo "";
+ start_outer_table(TABLESTYLE, "width='70%'");
- ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::location_transfer()));
+ table_section(1);
+
+ locations_list_row(_("From Location:"), 'FromStockLocation', null, false, false, $order->fixed_asset);
+ locations_list_row(_("To Location:"), 'ToStockLocation', null,false, false, $order->fixed_asset);
- date_row(_("Date:"), 'AdjDate');
+ table_section(2, "50%");
- echo " ";
+ date_row(_("Date:"), 'AdjDate', '', true);
- echo " | "; // outer table
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_LOCTRANSFER, null, array('date'=>get_post('AdjDate'), 'location'=> get_post('FromStockLocation'))),
+ false, ST_LOCTRANSFER);
- echo "";
- movement_types_list_row(_("Transfer Type:"), 'type', null);
- echo " ";
-
- echo " |
";
- end_table(1); // outer table
+ end_outer_table(1); // outer table
}
//---------------------------------------------------------------------------------
function display_transfer_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"), '');
+ if (!$order->fixed_asset && count($order->line_items)) $th[] = '';
table_header($th);
- $subtotal = 0;
$k = 0; //row colour counter
+ $low_stock = $order->check_qoh($_POST['FromStockLocation'], $_POST['AdjDate'], true);
$id = find_submit('Edit');
foreach ($order->line_items as $line_no=>$stock_item)
{
if ($id != $line_no)
{
- alt_table_row_color($k);
-
- view_stock_status_cell($stock_item->stock_id);
+ 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);
label_cell($stock_item->item_description);
qty_cell($stock_item->quantity, false, get_qty_dec($stock_item->stock_id));
label_cell($stock_item->units);
- edit_button_cell("Edit$line_no", _("Edit"),
- _('Edit document line'));
- edit_button_cell("Delete$line_no", _("Delete"),
- _('Remove line from document'));
+ 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
@@ -91,6 +94,8 @@ function display_transfer_items($title, &$order)
transfer_edit_item_controls($order);
end_table();
+ if ($low_stock)
+ display_note(_("Marked items have insufficient quantities in stock as on day of transfer."), 0, 1, "class='stockmankofg'");
div_end();
}
@@ -115,27 +120,37 @@ function transfer_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 ($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');
}
$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['units'] = $item_info["units"];
}
- small_qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
+ if ($order->fixed_asset) {
+ hidden('qty', 1);
+ qty_cell(1, false, 0);
+ } else
+ small_qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
+
label_cell($_POST['units'], '', 'units');
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');
}
@@ -164,4 +179,3 @@ function transfer_options_controls()
//---------------------------------------------------------------------------------
-?>
\ No newline at end of file