X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fstock_transfers_ui.inc;h=474fc9df31c692df9d9ee1fbf493365a47797190;hb=e39de7da91ecfd75c09a8537b4d5192e690687e7;hp=26609a1bf7b32ca3125cb09e84b996280a9b305a;hpb=3aebde86793f495095e09160ebaae3e7b7040747;p=fa-stable.git

diff --git a/inventory/includes/stock_transfers_ui.inc b/inventory/includes/stock_transfers_ui.inc
index 26609a1b..474fc9df 100644
--- a/inventory/includes/stock_transfers_ui.inc
+++ b/inventory/includes/stock_transfers_ui.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 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 "<tr><td width=33% valign=top>"; // outer table
-	echo "<table>";
+	start_outer_table(TABLESTYLE, "width=70%");
 
+	table_section(1);
+	
 	locations_list_row(_("From Location:"), 'FromStockLocation', null);
 	locations_list_row(_("To Location:"), 'ToStockLocation', null);
 
-	echo "</table>";
-
-	echo "</td><td width=33%>"; // outer table
-
-	echo "<table>";
-
-	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 "</table>";
+    date_row(_("Date:"), 'AdjDate', '', true);
 
-	echo "</td><td width=33%>"; // outer table
+	table_section(3, "33%");
 
-	echo "<table>";
     movement_types_list_row(_("Transfer Type:"), 'type', null);
-	echo "</table>";
 
-	echo "</td></tr>";
-	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();
 		}
@@ -123,7 +124,8 @@ function transfer_edit_item_controls(&$order, $line_no=-1)
 
     	$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');
 	}