X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fincludes%2Fstock_transfers_ui.inc;h=474fc9df31c692df9d9ee1fbf493365a47797190;hb=bac6bc5d595dab716bb3c65e451e81d724b8de2d;hp=63d7c970d8148b79e6b3dd9edc0a880933baa973;hpb=71691d5a6dab476e070925dc078265f1aa8658f5;p=fa-stable.git
diff --git a/inventory/includes/stock_transfers_ui.inc b/inventory/includes/stock_transfers_ui.inc
index 63d7c970..474fc9df 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");
@@ -17,47 +26,39 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
function display_order_header(&$order)
{
- global $table_style;
+ global $Refs;
- start_table("width=70% $table_style");
- echo "
"; // outer table
- echo "";
+ start_outer_table(TABLESTYLE, "width=70%");
+ table_section(1);
+
locations_list_row(_("From Location:"), 'FromStockLocation', null);
locations_list_row(_("To Location:"), 'ToStockLocation', null);
- echo " ";
-
- echo " | "; // outer table
-
- echo "";
-
- ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::location_transfer()));
+ table_section(2, "33%");
- date_row(_("Date:"), 'AdjDate');
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_LOCTRANSFER));
- echo " ";
+ date_row(_("Date:"), 'AdjDate', '', true);
- echo " | "; // outer table
+ table_section(3, "33%");
- 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 ( count($order->line_items)) $th[] = '';
table_header($th);
$subtotal = 0;
$k = 0; //row colour counter
@@ -77,7 +78,7 @@ function display_transfer_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();
}
@@ -116,14 +117,15 @@ 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 (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"];
}
@@ -132,10 +134,10 @@ function transfer_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');
}