From 4def49c9e0be02ccdf814188c2a72ebd969a7a98 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 28 Jan 2008 15:08:32 +0000
Subject: [PATCH] Release 1.16. Look in CHANGELOG.txt for changes.

---
 CHANGELOG.txt                                 |  23 +-
 access/login.php                              |  22 +-
 admin/create_coy.php                          |  58 +-
 admin/db/maintenance_db.inc                   |   5 +
 config.php                                    |   9 +-
 includes/db/connect_db.inc                    |  20 +-
 includes/page/header.inc                      |  14 +-
 includes/ui/ui_lists.inc                      | 675 ++++++++-----
 .../LC_MESSAGES/empty.po                      | 942 +++++++++---------
 purchasing/includes/ui/po_ui.inc              |  69 +-
 sales/includes/ui/sales_order_ui.inc          |  84 +-
 11 files changed, 1114 insertions(+), 807 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1302cd37..ac35d039 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,27 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+-------------------- 1.16 Stable Released ----------------------
+28-Jan-2008 Joe Hunt
+ + Added a possibility to replace the normal listboxes for items, customer and/or suppliers with a search box.
+   The listboxes can only hold about 1000 items. New variables in config.php, $no_item_list, $no_customer_list 
+   and $no_supplier_list. Default is the normal behavior for all listboxes.
+ $ /includes/ui/ui_lists.inc
+   /sales/includes/ui/sales_orders_ui.inc
+   /purchases/includes/ui/po_ui.inc
+   /themes/default/images/locate.png (New file)
+   config.php
+
+ + Added ALTER TABLE possibility in db_import. For future releases.
+ $ /admin/db/maintenence_db.inc  
+
+ # Removed warnings 'Call-time pass-by-reference' in /includes/db/connect_db.inc and /includes/ui/ui_lists.inc
+ # Fixed File not found when loading local stylesheet.css (for other languages) in /includes/page/header.inc
+ $ /includes/db/connect_db.inc
+   /includes/ui/ui_lists.inc
+   /includes/page/header.inc
+   /access/login.php
+   
 16-Jan-2008 Joe Hunt
  # When login screen is displayed after session timeout page content is broken. It
    is because of NOT using absolute paths in href attribute theme elements.
@@ -29,7 +50,7 @@ $ -> Affected files
  $ /admin/db/maintenance_db.inc
  
 29-Dec-2007 Joe Hunt
- ! Added a variable, $print_invoice_no, in config.php for printing the invoice number instead of invoice reference.
+ + Added a variable, $print_invoice_no, in config.php for printing the invoice number instead of invoice reference.
  $ config.php
  
  # Fixed a bug when exporting database. Exported NULL field values from NO to empty field (from mysql version 5.0.32).
diff --git a/access/login.php b/access/login.php
index 9fd3356d..7b47c633 100644
--- a/access/login.php
+++ b/access/login.php
@@ -46,7 +46,7 @@ function defaultCompany()
                     <table width="346" border="0" cellpadding="0" cellspacing="0">
 					<form action="<?php echo $_SERVER['PHP_SELF'];?>" name="loginform" method="post">
                         <tr>
-                            <td colspan="5" bgcolor="#FFFFFF"><img src="<?php echo $def_theme;?>/images/spacer.png" width="346" height="1" alt="" /></td>
+                            <td colspan="5" bgcolor="#FFFFFF"><img src="<?php echo $def_theme; ?>/images/spacer.png" width="346" height="1" alt="" /></td>
 
 						</tr>
 
@@ -54,9 +54,9 @@ function defaultCompany()
 
 
 
-                            <td bgcolor="#367CB5"><img src="<?php $def_theme; ?>/images/spacer.png" width="12" height="200" alt="" /></td>
+                            <td bgcolor="#367CB5"><img src="<?php echo $def_theme; ?>/images/spacer.png" width="12" height="200" alt="" /></td>
 
-                            <!--<td background="<?php $def_theme; ?>/images/outline/bg.png" width="233" height="200" colspan="3" valign="top">-->
+                            <!--<td background="<?php echo $def_theme; ?>/images/outline/bg.png" width="233" height="200" colspan="3" valign="top">-->
                             <td class="login" colspan="3" valign="top">
                                 <table border="0" cellpadding="3" cellspacing="0" width="100%">
                                     <tr>
@@ -91,33 +91,33 @@ for ($i = 0; $i < count($db_connections); $i++)
 	                        </td>
                         </tr>
                         <tr>
-                            <td colspan="5" bgcolor="#FFFFFF"><img src="<?php $def_theme; ?>/images/spacer.png" width="346" height="1" alt="" /></td>
+                            <td colspan="5" bgcolor="#FFFFFF"><img src="<?php echo $def_theme; ?>/images/spacer.png" width="346" height="1" alt="" /></td>
                         </tr>
 						</form>
                     </table>
 		            </td>
-		            <!--<td background="<?php $def_theme; ?>/images/outline/r.png" colspan="3" align="right" valign="top"><img src="<?php $def_theme; ?>/images/outline/tr.png" width="10" height="10" alt="" /></td>-->
+		            <!--<td background="<?php echo $def_theme; ?>/images/outline/r.png" colspan="3" align="right" valign="top"><img src="<?php echo $def_theme; ?>/images/outline/tr.png" width="10" height="10" alt="" /></td>-->
 		        </tr>
 		        <tr>
-		            <!--<td background="<?php $def_theme; ?>/images/outline/r.png"><img src="<?php $def_theme; ?>/images/outline/r.png" width="10" height="10" alt=""></td>-->
+		            <!--<td background="<?php echo $def_theme; ?>/images/outline/r.png"><img src="<?php echo $def_theme; ?>/images/outline/r.png" width="10" height="10" alt=""></td>-->
 		        </tr>
 		        <tr>
-					<!--<td background="<?php $def_theme; ?>/images/outline/bm.png"><img src="<?php $def_theme; ?>/images/outline/bl.png" width="10" height="10" alt=""></td>
-		            <!--<td background="<?php $def_theme; ?>/images/outline/bm.png"><img src="<?php $def_theme; ?>/images/outline/bm.png" width="10" height="10" alt=""></td>-->
-		            <!--<td><img src="<?php $def_theme; ?>/images/outline/br.png" width="10" height="10" alt="" /></td>-->
+					<!--<td background="<?php echo $def_theme; ?>/images/outline/bm.png"><img src="<?php echo $def_theme; ?>/images/outline/bl.png" width="10" height="10" alt=""></td>
+		            <!--<td background="<?php echo $def_theme; ?>/images/outline/bm.png"><img src="<?php echo $def_theme; ?>/images/outline/bm.png" width="10" height="10" alt=""></td>-->
+		            <!--<td><img src="<?php echo $def_theme; ?>/images/outline/br.png" width="10" height="10" alt="" /></td>-->
 		        </tr>
 <tr><td>&nbsp;</td></tr><tr>
 		<td align="center" class="footer"><font size=1><a target='_blank' style="text-decoration: none" HREF='<?php echo $power_url; ?>'><font color="#FFFF00" valign="top">&nbsp;&nbsp;<?php echo $power_by; ?></font></a></font></td>
 	</tr>
 <!--<tr><td>&nbsp;</td></tr><tr>
-	<td align="center" class="footer"><a target="_blank" HREF="http://frontaccounting.com/"><img src="<?php $def_theme; ?>/images/logo_frontaccounting.png"  height="60" width="60" border="0"/></a></td>
+	<td align="center" class="footer"><a target="_blank" HREF="http://frontaccounting.com/"><img src="<?php echo $def_theme; ?>/images/logo_frontaccounting.png"  height="60" width="60" border="0"/></a></td>
 </tr>-->
 <?php
 if ($allow_demo_mode == true)
 {
     ?>
       <tr>
-        <!--<td><br><div align="center"><a href="http://frontaccounting.com"><img src="<?php $def_theme; ?>/images/logo_frontaccounting.png"  border="0" align="middle" /></a></div></td>-->
+        <!--<td><br><div align="center"><a href="http://frontaccounting.com"><img src="<?php echo $def_theme; ?>/images/logo_frontaccounting.png"  border="0" align="middle" /></a></div></td>-->
       </tr>
     <?php
 }
diff --git a/admin/create_coy.php b/admin/create_coy.php
index ef633b5f..85579e0f 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -17,7 +17,7 @@ page(_("Create/Update Company"));
 if (isset($_GET['selected_id']))
 {
 	$selected_id = $_GET['selected_id'];
-} 
+}
 elseif (isset($_POST['selected_id']))
 {
 	$selected_id = $_POST['selected_id'];
@@ -39,7 +39,7 @@ function handle_submit()
 	global $db_connections, $def_coy, $tb_pref_counter, $db;
 
 	$new = false;
-	
+
 	if (!check_data())
 		return false;
 
@@ -61,13 +61,13 @@ function handle_submit()
 			$db_connections[$id]['tbpref'] = $_POST['tbpref'];
 		else
 			$db_connections[$id]['tbpref'] = "";
-	}		
+	}
 	if ((bool)$_POST['def'] == true)
 		$def_coy = $id;
 	$error = write_config_db($new);
 	if ($error == -1)
 		display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
-	else if ($error == -2)	
+	else if ($error == -2)
 		display_error(_("Cannot write to the configuration file - ") . $path_to_root . "/config_db.php");
 	else if ($error == -3)
 		display_error(_("The configuration file ") . $path_to_root . "/config_db.php" . _(" is not writable. Change its permissions so it is, then re-run the operation."));
@@ -82,15 +82,15 @@ function handle_submit()
 			set_global_connection();
 			return false;
 		}
-	
+
 		$filename = $_FILES['uploadfile']['tmp_name'];
-		if (is_uploaded_file ($filename)) 
+		if (is_uploaded_file ($filename))
 		{
 			db_import($filename, $conn, $id);
 			if (isset($_POST['admpassword']) && $_POST['admpassword'] != "")
 				db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
-		} 
-		else 
+		}
+		else
 		{
 			display_error(_("Error uploading Database Script, please upload it manually"));
 			set_global_connection();
@@ -107,7 +107,7 @@ function handle_delete()
 {
 	global $def_coy, $db_connections;
 
-	$id = $_GET['id'];	
+	$id = $_GET['id'];
 
 	$dbase = $db_connections[$id]['dbname'];
 	$err = db_drop_db($db_connections[$id]);
@@ -122,7 +122,7 @@ function handle_delete()
 	$error = write_config_db();
 	if ($error == -1)
 		display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
-	else if ($error == -2)	
+	else if ($error == -2)
 		display_error(_("Cannot write to the configuration file - ") . $path_to_root . "/config_db.php");
 	else if ($error == -3)
 		display_error(_("The configuration file ") . $path_to_root . "/config_db.php" . _(" is not writable. Change its permissions so it is, then re-run the operation."));
@@ -130,7 +130,7 @@ function handle_delete()
 		return;
 	if ($err == 0)
 		display_error(_("Error removing Database: ") . $dbase . _(", please remove it manuallly"));
-	else		
+	else
 		meta_forward($_SERVER['PHP_SELF']);
 }
 
@@ -141,7 +141,7 @@ function display_companies()
 	global $table_style, $def_coy, $db_connections;
 
 	$coyno = $_SESSION["wa_current_user"]->company;
-	
+
 	echo "
 		<script language='javascript'>
 		function deleteCompany(id) {
@@ -151,10 +151,10 @@ function display_companies()
 		}
 		</script>";
 	start_table($table_style);
-	
-	$th = array(_("Company"), _("Database Host"), _("Database User"), 
+
+	$th = array(_("Company"), _("Database Host"), _("Database User"),
 		_("Database Name"), _("Table Pref"), _("Default"), "", "");
-	table_header($th);	
+	table_header($th);
 
 	$k=0;
 	$conn = $db_connections;
@@ -196,25 +196,25 @@ function display_company_edit($selected_id)
 		$n = $selected_id;
 	else
 		$n = count($db_connections);
-	
+
 	start_form(true, true);
 
 	echo "
 		<script language='javascript'>
 		function updateCompany() {
-			if (document.forms[0].uploadfile.value!='' && document.forms[0].dbname.value!='') {			
+			if (document.forms[0].uploadfile.value!='' && document.forms[0].dbname.value!='') {
 				document.forms[0].action='create_coy.php?c=u&ul=1&id=" . $n . "&fn=' + document.forms[0].uploadfile.value
 			}
 			else {
 				document.forms[0].action='create_coy.php?c=u&id=" . $n . "&fn=' + document.forms[0].uploadfile.value
-			}	
+			}
 			document.forms[0].submit()
 		}
 		</script>";
-	
+
 	start_table($table_style2);
 
-	if ($selected_id != -1) 
+	if ($selected_id != -1)
 	{
 		$conn = $db_connections[$selected_id];
 		$_POST['name'] = $conn['name'];
@@ -224,9 +224,9 @@ function display_company_edit($selected_id)
 		$_POST['dbname']  = $conn['dbname'];
 		$_POST['tbpref']  = $conn['tbpref'];
 		if ($selected_id == $def_coy)
-			$_POST['def'] = true; 
-		else	
-			$_POST['def'] = false; 
+			$_POST['def'] = true;
+		else
+			$_POST['def'] = false;
 		$_POST['dbcreate']  = false;
 		hidden('selected_id', $selected_id);
 		hidden('tbpref', $_POST['tbpref']);
@@ -237,7 +237,7 @@ function display_company_edit($selected_id)
 	text_row_ex(_("Company"), 'name', 30);
 	text_row_ex(_("Host"), 'host', 30);
 	text_row_ex(_("Database User"), 'dbuser', 30);
-	if ($selected_id == -1) 
+	if ($selected_id == -1)
 		text_row_ex(_("Database Password"), 'dbpassword', 30);
 	text_row_ex(_("Database Name"), 'dbname', 30);
 	if ($selected_id == -1)
@@ -245,7 +245,7 @@ function display_company_edit($selected_id)
 	else
 		label_row(_("Table Pref"), $_POST['tbpref']);
 	yesno_list_row(_("Default"), 'def', null, "", "", false);
-	
+
 	start_row();
 	label_cell(_("Database Script"));
 	label_cell("<input name='uploadfile' type='file'>");
@@ -264,19 +264,19 @@ function display_company_edit($selected_id)
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_GET['c']) && $_GET['c'] == 'df') 
+if (isset($_GET['c']) && $_GET['c'] == 'df')
 {
 
 	handle_delete();
 }
 
-if (isset($_GET['c']) && $_GET['c'] == 'u') 
+if (isset($_GET['c']) && $_GET['c'] == 'u')
 {
-	if (handle_submit()) 
+	if (handle_submit())
 	{
 		meta_forward($_SERVER['PHP_SELF']);
 	}
-}	
+}
 
 
 //---------------------------------------------------------------------------------------------
diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index fdbd51bf..0a710e34 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -149,6 +149,10 @@ function db_import($filename, $connection)
 				$table = true;
 				$table_queries[] = $line . "\n";
 			}
+			elseif (strtolower(substr($line, 0, 11)) == "alter table")
+			{
+				$data_queries[] = substr($line, 0, strlen($line) - 1);
+			}
 
 		// the current line belongs to a create sql query
 		}
@@ -202,6 +206,7 @@ function db_import($filename, $connection)
 			{
 				//if ($CONF['import_error']) echo $data_query."\n<div class=\"bold_left\">".mysql_error()."</div><br>\n";
 				$sql_error = true;
+				return false;
 			}
 		}
 	}
diff --git a/config.php b/config.php
index 7e82af0f..550efbe9 100644
--- a/config.php
+++ b/config.php
@@ -53,10 +53,10 @@
 	// Main Title
 	$app_title = "FrontAccounting";
     // application version
-    $version 		= "1.15";
+    $version 		= "1.16";
 
     // Build for development purposes
-    $build_version 	= "55";
+    $build_version 	= "15";
 
 	// Powered by
 	$power_by 		= "FrontAccounting";
@@ -90,6 +90,11 @@
 	/* print_invoice_no. 0 = print reference number, 1 = print invoice number */
 	$print_invoice_no = 0;
 
+	/* Flags for no item, customer and supplier lists. The list can only hold about 1000 items in the lists */
+	$no_item_list = 	0; // change value to 1 if you do not want all items in list
+	$no_customer_list = 0; // change value to 1 if you do not want all customers in list
+	$no_supplier_list = 0; // change value to 1 if you do not want all suppliers in list
+
 	$dateformats 	= array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD");
 	$dateseps 		= array("/", ".", "-", " ");
 	$thoseps 		= array(",", ".", " ");
diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index cedfd787..4bff9196 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -2,7 +2,7 @@
 
 set_global_connection();
 
-function set_global_connection() 
+function set_global_connection()
 {
 	global $db;
 
@@ -27,8 +27,8 @@ function db_query($sql, $err_msg=null)
 		echo "<pre>";
 		echo $sql;
 		echo "</pre>\n";
-	}	
-	
+	}
+
 
 	$result = mysql_query($sql, $db);
 
@@ -38,19 +38,19 @@ function db_query($sql, $err_msg=null)
 	return $result;
 }
 
-function db_fetch_row (&$result) 
+function db_fetch_row ($result)
 {
 
 	return mysql_fetch_row($result);
 }
 
-function db_fetch (&$result) 
+function db_fetch ($result)
 {
 
-	return mysql_fetch_array(&$result);
+	return mysql_fetch_array($result);
 }
 
-function db_seek (&$result,$record) 
+function db_seek (&$result,$record)
 {
 	mysql_data_seek($result, $record);
 }
@@ -66,12 +66,12 @@ function db_num_rows (&$result)
 	return mysql_num_rows($result);
 }
 
-function db_num_fields (&$result)
+function db_num_fields ($result)
 {
 	return mysql_num_fields($result);
 }
 
-function db_escape (&$result)
+function db_escape ($result)
 {
 	return mysql_escape_string($result);
 }
@@ -82,7 +82,7 @@ function db_error_no ()
 	return mysql_errno($db);
 }
 
-function db_error_msg(&$conn)
+function db_error_msg($conn)
 {
 	return mysql_error($conn);
 }
diff --git a/includes/page/header.inc b/includes/page/header.inc
index 4a74bb7b..c421a665 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -7,13 +7,13 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 	$theme = user_theme();
 	$local_path_to_root = $path_to_root;
 
-	if (!isset($no_menu)) 
+	if (!isset($no_menu))
 	{
 		$no_menu = false;
 	}
 	if (!isset($_SESSION["sel_app"]))
-		session_register("sel_app");	
-	if (isset($_SESSION["App"]) && is_object($_SESSION["App"]) && isset($_SESSION["App"]->selected_application) && 
+		session_register("sel_app");
+	if (isset($_SESSION["App"]) && is_object($_SESSION["App"]) && isset($_SESSION["App"]->selected_application) &&
 		$_SESSION["App"]->selected_application != "")
 	 	$sel_app = $_SESSION["App"]->selected_application;
 	elseif (isset($_SESSION["sel_app"]) && $_SESSION["sel_app"] != "")
@@ -25,9 +25,11 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
     echo "<html dir='" . $_SESSION['language']->dir . "' >";
     echo "<head><title>$title</title>";
     $encoding = $_SESSION['language']->encoding;
+    $local_stylesheet = $_SESSION['language']->get_stylesheet();
 	echo "<meta http-equiv='Content-type' content='text/html'; charset='$encoding'>";
 	echo "<link href='$local_path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css' /> \n";
-	echo "<link href='$local_path_to_root/" . $_SESSION['language']->get_stylesheet() . "' rel='stylesheet' type='text/css' /> \n";
+	if (file_exists($local_path_to_root. "/".$local_stylesheet))
+		echo "<link href='$local_path_to_root/$local_stylesheet' rel='stylesheet' type='text/css' /> \n";
 	if ($js != "")
 		echo $js;
 	echo "</head> \n";
@@ -45,7 +47,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
     echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
     echo "<td class='quick_menu'>\n";
-	if (!$no_menu) 
+	if (!$no_menu)
 	{
 		echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
 		echo "<div class=tabs>";
@@ -68,7 +70,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 
 	echo "</td></tr></table>";
 
-	if ($title && !$no_menu && !$is_index) 
+	if ($title && !$no_menu && !$is_index)
 	{
 		echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td></tr></table></center>";
 	}
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 56290071..b75d66c8 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -2,6 +2,10 @@
 
 include_once($path_to_root . "/includes/banking.inc");
 
+define("DEFVAL", "--");
+$search_button = "<input type='submit' class='inputsubmit' style='border:0;background:url($path_to_root/themes/default/images/locate.png) no-repeat;' name='%s' value='?' title='"._("Search")."'> ";
+//$search_button = "<input type='submit' class='inputsubmit' name='%s' value='?'> ";
+
 $all_items = reserved_words::get_all();
 
 // TDB for all list functions : if there is no data, display a link to the releveant
@@ -9,6 +13,50 @@ $all_items = reserved_words::get_all();
 
 function supplier_list($name, $selected_id, $all_option=false, $submit_on_change=false)
 {
+	global $no_supplier_list, $all_items;
+
+	if ($selected_id == null)
+		$selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
+
+	if ($no_supplier_list)
+	{
+		global $search_button;
+		$edit_name = $name."_edit";
+		$edit_button = $name."_button";
+
+		$val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
+		if (isset($_POST[$edit_button]))
+		{
+			$selected_id = $_POST[$name] = "";
+		}
+
+		if ($selected_id != "")
+		{
+			$val = DEFVAL;
+			$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers WHERE supplier_id=$selected_id";
+			$supplier_result = db_query($supplier_sql);
+		}
+		else
+		{
+			if ($val != "" && $val != DEFVAL)
+			{
+				$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers WHERE supp_name LIKE '%{$val}%' ORDER BY supp_name";
+				$supplier_result = db_query($supplier_sql);
+			}
+			else
+				$supplier_result = false;
+		}
+
+		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
+
+		echo sprintf($search_button, $edit_button);
+	}
+	else
+	{
+		$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ORDER BY supp_name";
+		$supplier_result = db_query($supplier_sql);
+	}
+
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
 	else
@@ -16,34 +64,29 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change
 
 	$company_currency = get_company_currency();
 
-	$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ORDER BY supp_name";
-	$supplier_result = db_query($supplier_sql);
-
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	if ($all_option == true)
 	{
-    	if (reserved_words::get_all() == $selected_id)
+    	if ($selected_id == $all_items)
     	{
-    	     echo "<option selected value='" . reserved_words::get_all(). "'>" . _("All Suppliers") . "</option>\n";
-    	} 
-    	else 
+    	     echo "<option selected value='$all_items'>" . _("All Suppliers") . "</option>\n";
+    	}
+    	else
     	{
-    	     echo "<option value='" . reserved_words::get_all(). "'>" . _("All Suppliers") . "</option>\n";
+    	     echo "<option value='$all_items'>" . _("All Suppliers") . "</option>\n";
     	}
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
-			$selected_id = reserved_words::get_all();
+			$selected_id = $all_items;
 		}
 	}
 
-	while ($supplier_row = db_fetch_row($supplier_result)) 
+	while ($supplier_row = db_fetch_row($supplier_result))
 	{
-		if ($selected_id==$supplier_row[0]) 
+		if ($selected_id==$supplier_row[0])
 		{
 			echo "<option selected value='" . $supplier_row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $supplier_row[0] . "'>";
 		}
@@ -52,7 +95,7 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change
 		if ($supplier_row[2] != $company_currency)
 			echo "&nbsp;-&nbsp;" . $supplier_row[2];
 		echo  "</option>\n";
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $supplier_row[0];
 			$_POST[$name] = $selected_id;
@@ -68,7 +111,7 @@ function supplier_list_cells($label, $name, $selected_id, $all_option=false, $su
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
-	echo "<td>";
+	echo "<td nowrap>";
 	supplier_list($name, $selected_id, $all_option, $submit_on_change);
 	echo "</td>\n";
 }
@@ -84,41 +127,79 @@ function supplier_list_row($label, $name, $selected_id, $all_option=false, $subm
 
 function customer_list($name, $selected_id, $all_option=false, $submit_on_change=false)
 {
+	global $no_customer_list, $all_items;
+
+	if ($selected_id == null)
+		$selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
+
+	if ($no_customer_list)
+	{
+		global $search_button;
+		$edit_name = $name."_edit";
+		$edit_button = $name."_button";
+
+		$val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
+		if (isset($_POST[$edit_button]))
+		{
+			$selected_id = $_POST[$name] = "";
+			$_POST['branch_id'] = "";
+		}
+
+		if ($selected_id != "")
+		{
+			$val = DEFVAL;
+			$customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=$selected_id";
+			$customer_result = db_query($customer_sql);
+		}
+		else
+		{
+			if ($val != "" && $val != DEFVAL)
+			{
+				$customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master WHERE name LIKE '%{$val}%' ORDER BY name";
+				$customer_result = db_query($customer_sql);
+			}
+			else
+				$customer_result = false;
+		}
+
+		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
+
+		echo sprintf($search_button, $edit_button);
+	}
+	else
+	{
+		$customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ORDER BY name";
+		$customer_result = db_query($customer_sql);
+	}
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
 	else
 		echo "<select name='$name'>";
 
-	$customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ORDER BY name";
-	$customer_result = db_query($customer_sql);
-
 	$company_currency = get_company_currency();
 
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	if (($all_option == true))
 	{
-    	if (reserved_words::get_all() == $selected_id)
+    	if ($selected_id == $all_items)
     	{
-    	     echo "<option selected value='" . reserved_words::get_all(). "'>" . _("All Customers") . "</option>\n";
-    	} 
-    	else 
+    	     echo "<option selected value='$all_items'>" . _("All Customers") . "</option>\n";
+    	}
+    	else
     	{
-    	     echo "<option value='" . reserved_words::get_all(). "'>" . _("All Customers") . "</option>\n";
+    	     echo "<option value='$all_items'>" . _("All Customers") . "</option>\n";
     	}
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
-			$selected_id =  reserved_words::get_all();
+			$selected_id =  $all_items;
 		}
 	}
-
-	while ($customer_row = db_fetch_row($customer_result)) 
+	while ($customer_row = db_fetch_row($customer_result))
 	{
-		if ($selected_id == $customer_row[0]) 
+		if ($selected_id == $customer_row[0])
 		{
 			echo "<option selected value='" . $customer_row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $customer_row[0] . "'>";
 		}
@@ -130,7 +211,7 @@ function customer_list($name, $selected_id, $all_option=false, $submit_on_change
 		echo  "</option>\n";
 		// if no initial selection - set the first item
 		// do we want to do this for all lists ???? probably
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $customer_row[0];
 			$_POST[$name] = $selected_id;
@@ -138,7 +219,6 @@ function customer_list($name, $selected_id, $all_option=false, $submit_on_change
 	}
 
 	echo "</select>";
-
 	db_free_result($customer_result);
 }
 
@@ -146,7 +226,7 @@ function customer_list_cells($label, $name, $selected_id, $all_option = false, $
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
-	echo "<td>";
+	echo "<td nowrap>";
 	customer_list($name, $selected_id, $all_option, $submit_on_change);
 	echo "</td>\n";
 }
@@ -181,29 +261,29 @@ function customer_branches_list($customer_id, $name, $selected_id,
 	if ($all_option == true)
 	{
 		echo "<option ";
-		if (reserved_words::get_all() == $selected_id)
+		if ($selected_id == $all_items)
 			echo " selected ";
-		echo "value='" . reserved_words::get_all(). "'>" . _("All Branches") . "</option>\n";
+		echo "value='$all_items'>" . _("All Branches") . "</option>\n";
 
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
-			$selected_id =  reserved_words::get_all();
+			$selected_id =  $all_items;
 		}
 	}
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
 		echo $row[1] . "</option>\n";
 
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
@@ -232,8 +312,10 @@ function customer_branches_list_row($label,$customer_id, $name, $selected_id, $a
 
 //------------------------------------------------------------------------------------------------
 
-function locations_list($name, $selected_id, $all_option=false, $submit_on_change=false, $all_option_name="")
+function locations_list($name, $selected_id, $all_option=false, $submit_on_change=false)
 {
+	global $all_items;
+
 	if ($submit_on_change == true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
 	else
@@ -251,28 +333,29 @@ function locations_list($name, $selected_id, $all_option=false, $submit_on_chang
 	if ($all_option == true)
 	{
 		echo "<option ";
-    	if ($selected_id == reserved_words::get_all())
+    	if ($selected_id == $all_items)
     	     echo " selected ";
-		echo " value='" . reserved_words::get_all(). "'>" . _("All Locations") . "</option>\n";
+		echo " value='$all_items'>" . _("All Locations") . "</option>\n";
 
-		if ($selected_id == "") {
-			$selected_id = reserved_words::get_all();
+		if ($selected_id == "")
+		{
+			$selected_id = $all_items;
 		}
 	}
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
 		echo $row[1] . "</option>\n";
 
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
@@ -316,20 +399,20 @@ function currencies_list($name, &$selected_id, $submit_on_change=false)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
 		// default to the company currency
-		if ($selected_id == "" && ($row[0] == $company_currency)) 
+		if ($selected_id == "" && ($row[0] == $company_currency))
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
 		}
 
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
@@ -372,20 +455,20 @@ function fiscalyears_list($name, &$selected_id, $submit_on_change=false)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
 		// default to the company current fiscal year
-		if ($selected_id == "" && ($row[0] == $company_year)) 
+		if ($selected_id == "" && ($row[0] == $company_year))
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
 		}
 
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
@@ -393,8 +476,8 @@ function fiscalyears_list($name, &$selected_id, $submit_on_change=false)
 			$how = _('Active');
 		else
 			$how = _('Closed');
-		$row[1] = sql2date($row[1]);	
-		$row[2] = sql2date($row[2]);	
+		$row[1] = sql2date($row[1]);
+		$row[2] = sql2date($row[2]);
 		echo $row[1] . "&nbsp;-&nbsp;" . $row[2] . "&nbsp;&nbsp;" . $how . "</option>\n";
 	}
 
@@ -421,9 +504,11 @@ function fiscalyears_list_row($label, $name, $selected_id)
 //---------------------------------------------------------------------------------------------------
 
 function simple_codeandname_list($sql, $name, &$selected_id,
-	$all_option=false, $all_option_name=null, $all_option_numeric=false, 
+	$all_option=false, $all_option_name=null, $all_option_numeric=false,
 	$submit_on_change=false, $returnzero=false)
 {
+	global $all_items;
+
 	if ($submit_on_change == true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
 	else
@@ -438,17 +523,17 @@ function simple_codeandname_list($sql, $name, &$selected_id,
 		elseif ($all_option_numeric)
 			$reserved_word = reserved_words::get_all_numeric();
 		else
-			$reserved_word = reserved_words::get_all();
+			$reserved_word = $all_items;
 
-    	if ($reserved_word == $selected_id)
+    	if ($selected_id == $reserved_word)
     	{
-    	     echo "<option selected value='" . $reserved_word . "'>" . $all_option_name . "</option>\n";
-    	} 
-    	else 
+    	     echo "<option selected value='$reserved_word'>$all_option_name</option>\n";
+    	}
+    	else
     	{
-    	     echo "<option value='" . $reserved_word . "'>" . $all_option_name . "</option>\n";
+    	     echo "<option value='$reserved_word'>$all_option_name</option>\n";
     	}
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id =  $reserved_word;
 		}
@@ -456,9 +541,9 @@ function simple_codeandname_list($sql, $name, &$selected_id,
 
 	$result = db_query($sql);
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
 		} else {
@@ -466,7 +551,7 @@ function simple_codeandname_list($sql, $name, &$selected_id,
 		}
 		echo $row[1] . "</option>\n";
 
-		if (!$returnzero && $selected_id == "") 
+		if (!$returnzero && $selected_id == "")
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
@@ -492,13 +577,13 @@ function dimensions_list($name, &$selected_id, $no_option=false, $showname=null,
 			$sql .= " AND type_=$showtype";
 		else if ($showtype)
 			$sql .= " type_=$showtype";
-	}		
-	$sql .= " ORDER BY reference";	
-	simple_codeandname_list($sql, $name, &$selected_id, $no_option, $showname,	
+	}
+	$sql .= " ORDER BY reference";
+	simple_codeandname_list($sql, $name, $selected_id, $no_option, $showname,
 		true, $submit_on_change, true);
 }
 
-function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $showname=null, 
+function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $showname=null,
 	$showclosed=false, $showtype=0)
 {
 	if ($label != null)
@@ -508,11 +593,11 @@ function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $s
 	echo "</td>\n";
 }
 
-function dimensions_list_row($label, $name, $selected_id, $no_option=false, $showname=null, 
+function dimensions_list_row($label, $name, $selected_id, $no_option=false, $showname=null,
 	$showclosed=false, $showtype=0)
 {
 	echo "<tr>\n";
-	dimensions_list_cells($label, $name, $selected_id, $no_option, $showname, 
+	dimensions_list_cells($label, $name, $selected_id, $no_option, $showname,
 		$showclosed, $showtype);
 	echo "</tr>\n";
 }
@@ -521,43 +606,88 @@ function dimensions_list_row($label, $name, $selected_id, $no_option=false, $sho
 
 function stock_items_list($name, $selected_id, $all_option=false, $submit_on_change=false, $extra="")
 {
-	global $all_items;
+	global $all_items, $no_item_list;
+
+	if ($selected_id == null)
+		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+
+	if ($no_item_list)
+	{
+		global $search_button;
+		$edit_name = $name."_edit";
+		$edit_button = $name."_button";
+
+		$val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
+
+		if (isset($_POST[$edit_button]))
+		{
+			$selected_id = $_POST[$name] = "";
+		}
+
+		if ($selected_id != "")
+		{
+			$val = DEFVAL;
+			$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
+				FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
+				AND stock_id='$selected_id'";
+			$result = db_query($sql);
+		}
+		else
+		{
+			if ($val != "" && $val != DEFVAL)
+			{
+				$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
+					FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE "
+					.TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id AND
+					(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
+					.TB_PREF."stock_master.description LIKE '%{$val}%')";
+				$result = db_query($sql);
+			}
+			else
+				$result = false;
+		}
+
+		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
+
+		echo sprintf($search_button, $edit_button);
+	}
+	else
+	{
+		$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
+			FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id";
+		$result = db_query($sql);
+	}
+
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
-	else if ($extra != "")	
+	else if ($extra != "")
 		echo "<select name='$name' $extra>";
 	else
 		echo "<select name='$name'>";
 
-	$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-		FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id";
-	$result = db_query($sql);
-
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	if (($all_option == true))
 	{
-    	if ($all_items == $selected_id)
+    	if ($selected_id == $all_items)
     	{
     	     echo "<option selected value='$all_items'>" . _("All Items") . "</option>\n";
-    	} 
-    	else 
+    	}
+    	else
     	{
     	     echo "<option value='$all_items'>" . _("All Items") . "</option>\n";
     	}
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $all_items;
 		}
 	}
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
@@ -565,22 +695,21 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha
 
 		// if no initial selection - set the first item
 		// do we want to do this for all lists ???? probably
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
 		}
 	}
-
 	echo "</select>";
 	db_free_result($result);
 }
 
 function stock_items_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false, $extra="")
 {
-	if ($label != null) 
+	if ($label != null)
 		echo "<td>$label</td>\n";
-	echo "<td>";
+	echo "<td nowrap>";
 	stock_items_list($name, $selected_id, $all_option, $submit_on_change, $extra);
 	echo "</td>\n";
 }
@@ -612,33 +741,33 @@ function stock_bom_items_list($name, $selected_id, $all_option=false, $submit_on
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	if (($all_option == true))
 	{
-    	if ($all_items == $selected_id)
+    	if ($selected_id == $all_items)
     	{
     	     echo "<option selected value='$all_items'>" . _("All Items") . "</option>\n";
-    	} 
-    	else 
+    	}
+    	else
     	{
     	     echo "<option value='$all_items'>" . _("All Items") . "</option>\n";
     	}
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $all_items;
 		}
 	}
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id==$row[0]) 
+		if ($selected_id==$row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
 		echo (user_show_codes()?$row[0] . "&nbsp;-&nbsp;":"") . $row[2] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
 
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
@@ -670,9 +799,11 @@ function stock_bom_items_list_row($label, $name, $selected_id, $all_option=false
 function base_stock_items_list($sql, $name, &$selected_id,
 	$all_option=false, $all_option_name="", $submit_on_change=false, $extra="")
 {
+	global $all_items;
+
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
-	else if ($extra != "")	
+	else if ($extra != "")
 		echo "<select name='$name' $extra>";
 	else
 		echo "<select name='$name'>";
@@ -683,33 +814,33 @@ function base_stock_items_list($sql, $name, &$selected_id,
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	if ($all_option == true)
 	{
-    	if (reserved_words::get_all() == $selected_id)
+    	if ($selected_id == $all_items)
     	{
-    	     echo "<option selected value='" . reserved_words::get_all(). "'>" . $all_option_name . "</option>\n";
-    	} 
-    	else 
+    	     echo "<option selected value='$all_items'>$all_option_name</option>\n";
+    	}
+    	else
     	{
-    	     echo "<option value='" . reserved_words::get_all(). "'>" . $all_option_name . "</option>\n";
+    	     echo "<option value='$all_items'>$all_option_name</option>\n";
     	}
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
-			$selected_id =  reserved_words::get_all();
+			$selected_id = $all_items;
 		}
 	}
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
 		echo (user_show_codes()?$row[0] . "&nbsp;-&nbsp;":"") . $row[2] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
 
-		if ($selected_id == "") 
+		if ($selected_id == "")
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
@@ -722,14 +853,14 @@ function base_stock_items_list($sql, $name, &$selected_id,
 
 //------------------------------------------------------------------------------------
 
-function stock_manufactured_items_list($name, $selected_id,
+function stock_manufactured_items_list($name, &$selected_id,
 	$all_option=false, $submit_on_change=false)
 {
 	$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
 		FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
 		AND (".TB_PREF."stock_master.mb_flag='M')";
 
-	base_stock_items_list($sql, $name, &$selected_id,	$all_option, _("All Items"),
+	base_stock_items_list($sql, $name, $selected_id,	$all_option, _("All Items"),
 		$submit_on_change);
 }
 
@@ -759,21 +890,109 @@ function stock_component_items_list($name, $parent_stock_id, &$selected_id,
 		".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
 		AND stock_id != '$parent_stock_id'";
 
-	base_stock_items_list($sql, $name, &$selected_id,
+	base_stock_items_list($sql, $name, $selected_id,
 		$all_option, _("All Items"), $submit_on_change);
 }
 
 //------------------------------------------------------------------------------------
 
-function stock_purchasable_items_list($name, &$selected_id,
-	$all_option=false, $submit_on_change=false, $extra="")
+function stock_purchasable_items_list($name, &$selected_id,	$all_option=false, $submit_on_change=false, $extra="")
 {
-	$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-		FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-		AND mb_flag !='M'";
+	global $no_item_list, $all_items;
+
+	if ($selected_id == null)
+		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+
+	if ($no_item_list)
+	{
+		$edit_name = $name."_edit";
+		$edit_button = $name."_button";
+
+		$val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
+		if (isset($_POST[$edit_button]))
+		{
+			$selected_id = $_POST[$name] = "";
+		}
+
+		if ($selected_id != "")
+		{
+			$val = DEFVAL;
+			$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
+				FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
+				AND mb_flag !='M' AND stock_id='$selected_id'";
+			$result = db_query($sql);
+		}
+		else
+		{
+			if ($val != "" && $val != DEFVAL)
+			{
+				$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
+					FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE "
+					.TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id AND mb_flag !='M' AND
+					(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
+					.TB_PREF."stock_master.description LIKE '%{$val}%')";
+				$result = db_query($sql);
+			}
+			else
+				$result = false;
+		}
+
+		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' > ";
 
-	base_stock_items_list($sql, $name, &$selected_id,
-		$all_option, _("All Items"), $submit_on_change, $extra);
+		echo "<input type='submit' class='inputsubmit' name='$edit_button' value='?'> ";
+	}
+	else
+	{
+		$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
+			FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id="
+			.TB_PREF."stock_category.category_id AND mb_flag !='M'";
+		$result = db_query($sql);
+	}
+
+	if ($submit_on_change==true)
+		echo "<select name='$name' onchange='this.form.submit();'>";
+	else if ($extra != "")
+		echo "<select name='$name' $extra>";
+	else
+		echo "<select name='$name'>";
+
+	if ($all_option == true)
+	{
+    	if ($selected_id == $all_items)
+    	{
+    	     echo "<option selected value='$all_items'>"._("All Items")."</option>\n";
+    	}
+    	else
+    	{
+    	     echo "<option value='$all_items'>"._("All Items")."</option>\n";
+    	}
+		if ($selected_id == "")
+		{
+			$selected_id = $all_items;
+		}
+	}
+
+	while ($row = db_fetch_row($result))
+	{
+		if ($selected_id == $row[0])
+		{
+			echo "<option selected value='" . $row[0] . "'>";
+		}
+		else
+		{
+			echo "<option value='" . $row[0] . "'>";
+		}
+		echo (user_show_codes()?$row[0] . "&nbsp;-&nbsp;":"") . $row[2] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
+
+		if ($selected_id == "")
+		{
+			$selected_id = $row[0];
+			$_POST[$name] = $selected_id;
+		}
+	}
+
+	echo "</select>";
+	db_free_result($result);
 }
 
 function stock_purchasable_items_list_cells($label, $name, &$selected_id, $all_option=false, $submit_on_change=false, $extra = "")
@@ -801,7 +1020,7 @@ function stock_costable_items_list($name, &$selected_id,
 		FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
 		AND mb_flag !='D'";
 
-	base_stock_items_list($sql, $name, &$selected_id,
+	base_stock_items_list($sql, $name, $selected_id,
 		$all_option, _("All Items"), $submit_on_change);
 }
 
@@ -812,7 +1031,7 @@ function stock_item_types_list_row($label, $name, $selected_id, $enabled=true)
 	echo "<tr>";
 	if ($label != NULL)
 		echo "<td>$label</td>\n";
-	echo "<td>";		
+	echo "<td>";
 	if ($enabled)
 		echo "<select name='$name' onchange='this.form.submit();'>\n";
 	else
@@ -836,18 +1055,18 @@ function stock_units_list_row($label, $name, $value, $enabled=true)
 		echo "<td><select name='$name'>";
 	else
 		echo "<td><select disabled name='$name'>";
-	
+
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	foreach ($stock_units as $unit) 
+	foreach ($stock_units as $unit)
 	{
 		if ($value == "")
 			$_POST[$name] = $value = $unit;
 		if ($value==$unit)
 		{
 			echo "<option selected value='$unit'>$unit</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$unit'>$unit</option>\n";
 		}
@@ -864,7 +1083,7 @@ function tax_types_list($name, $selected_id,
 		$name, $selected_id, $none_option, $none_option_name, true, $submit_on_change);
 }
 
-function tax_types_list_cells($label, $name, $selected_id, $none_option=false, 
+function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
 	$none_option_name=null, $submit_on_change=false)
 {
 	if ($label != null)
@@ -874,7 +1093,7 @@ function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
 	echo "</td>\n";
 }
 
-function tax_types_list_row($label, $name, $selected_id, $none_option=false, 
+function tax_types_list_row($label, $name, $selected_id, $none_option=false,
 	$none_option_name=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
@@ -1161,23 +1380,23 @@ function workcenter_list($name, $selected_id, $all_option=false)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	if ($all_option == true)
 	{
-    	if ($all_items == $selected_id)
+    	if ($selected_id == $all_items)
     	{
     	     echo "<option selected value='$all_items'>" . _("All Work Centres") . "</option>\n";
-    	} 
-    	else 
+    	}
+    	else
     	{
     	     echo "<option value='$all_items'>" . _("All Work Centres") . "</option>\n";
     	}
 	}
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
@@ -1222,13 +1441,13 @@ function bank_accounts_list($name, $selected_id, $submit_on_change=false)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
@@ -1240,7 +1459,7 @@ function bank_accounts_list($name, $selected_id, $submit_on_change=false)
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
-		}	
+		}
 	}
 
 	echo "</select>";
@@ -1277,13 +1496,13 @@ function class_list($name, $selected_id, $submit_on_change=false)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
@@ -1292,7 +1511,7 @@ function class_list($name, $selected_id, $submit_on_change=false)
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
-		}	
+		}
 	}
 
 	echo "</select>";
@@ -1362,14 +1581,14 @@ function gl_account_types_list_row($label, $name, $selected_id, $all_option=fals
 	$all_option_numeric=false)
 {
 	echo "<tr>\n";
-	gl_account_types_list_cells($label, $name, $selected_id, $all_option, 
+	gl_account_types_list_cells($label, $name, $selected_id, $all_option,
 		$all_option_name, $all_option_numeric);
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
 
-function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false, 
+function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
 	$show_group=false, $onchange="")
 {
 	echo "<select name='$name'";
@@ -1393,27 +1612,27 @@ function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	$result = db_query($sql, "query chart master");
 
-	while ($row = db_fetch_row($result)) 
+	while ($row = db_fetch_row($result))
 	{
-		if ($selected_id == $row[0]) 
+		if ($selected_id == $row[0])
 		{
 			echo "<option selected value='" . $row[0] . "'>";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='" . $row[0] . "'>";
 		}
 		//echo str_pad($row[0],6,'0', STR_PAD_LEFT) .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[2] . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
 		if ($show_group)
 			echo $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[2] . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1] . "</option>\n";
-		else	
+		else
 			echo $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1] . "</option>\n";
 
 		if ($selected_id == "")
 		{
 			$selected_id = $row[0];
 			$_POST[$name] = $selected_id;
-		}	
+		}
 	}
 
 	echo "</select>";
@@ -1434,7 +1653,7 @@ function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accoun
 	$show_group=false, $onchange="")
 {
 	echo "<tr>\n";
-	gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts, 
+	gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
 		$show_group, $onchange);
 	echo "</tr>\n";
 }
@@ -1446,11 +1665,11 @@ function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_c
 	else
 		echo "<select name='$name'>";
 
-	if (strlen($name_yes) == 0)	
+	if (strlen($name_yes) == 0)
 	{
 		unset($name_yes);
 	}
-	if (strlen($name_no) == 0)	
+	if (strlen($name_no) == 0)
 	{
 		unset($name_no);
 	}
@@ -1461,18 +1680,18 @@ function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_c
     	echo "<option value=1>";
     else
     	echo "<option selected value=1>";
-	if (!isset($name_yes)) 
-		echo _("Yes") . "</option>\n"; 
-	else 
-		echo $name_yes . "</option>\n"; 
+	if (!isset($name_yes))
+		echo _("Yes") . "</option>\n";
+	else
+		echo $name_yes . "</option>\n";
 	if ($selected_id == 0)
 		echo "<option selected value=0>";
-	else	
+	else
     	echo "<option value=0>";
-	if (!isset($name_no)) 
-		echo _("No") . "</option>\n"; 
-	else 
-		echo $name_no . "</option>\n"; 
+	if (!isset($name_no))
+		echo _("No") . "</option>\n";
+	else
+		echo $name_no . "</option>\n";
 	echo "</select>";
 }
 
@@ -1502,10 +1721,10 @@ function languages_list($name, &$selected_id)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	foreach ($installed_languages as $lang) 
+	foreach ($installed_languages as $lang)
 	{
 	  	echo "<option ";
-		if ($selected_id == $lang['code']) 
+		if ($selected_id == $lang['code'])
 			echo "selected ";
 		echo "value='" . $lang['code'] . "'>" . $lang['name'] . "</option>\n";
 	}
@@ -1537,10 +1756,10 @@ function bank_account_types_list($name, &$selected_id)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-  	foreach ($bank_account_types as $type) 
+  	foreach ($bank_account_types as $type)
   	{
       	echo "<option ";
-      	if ($selected_id == "" || $selected_id == $type['id']) 
+      	if ($selected_id == "" || $selected_id == $type['id'])
       		echo "selected ";
       	echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
   	}
@@ -1575,14 +1794,14 @@ function payment_person_types_list($name, $selected_id, $related=null)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-  	foreach ($types as $type) 
+  	foreach ($types as $type)
   	{
-		if (payment_person_types::has_items($type['id'])) 
+		if (payment_person_types::has_items($type['id']))
 		{
 			if ($selected_id == "")
 				$_POST[$name] = $selected_id = $type['id'];
   		    echo "<option ";
-  	    	if ($selected_id == $type['id']) 
+  	    	if ($selected_id == $type['id'])
   	    		echo "selected ";
   		    echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
 		}
@@ -1615,10 +1834,10 @@ function wo_types_list($name, &$selected_id)
 
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-  	foreach ($types as $type) 
+  	foreach ($types as $type)
   	{
   	    echo "<option ";
-  	    if ($selected_id == $type['id']) 
+  	    if ($selected_id == $type['id'])
   	    	echo "selected ";
   	    echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
   	}
@@ -1644,14 +1863,14 @@ function dateformats_list_row($label, $name, $value)
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
 	$counter = 0;
-	foreach ($dateformats as $df) 
+	foreach ($dateformats as $df)
 	{
 
 		if ($value==$counter)
 		{
 			echo "<option selected value='$counter'>$df</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$counter'>$df</option>\n";
 		}
@@ -1670,14 +1889,14 @@ function dateseps_list_row($label, $name, $value)
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
 	$counter = 0;
-	foreach ($dateseps as $ds) 
+	foreach ($dateseps as $ds)
 	{
 
 		if ($value==$counter)
 		{
 			echo "<option selected value='$counter'>$ds</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$counter'>$ds</option>\n";
 		}
@@ -1696,14 +1915,14 @@ function thoseps_list_row($label, $name, $value)
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
 	$counter = 0;
-	foreach ($thoseps as $ts) 
+	foreach ($thoseps as $ts)
 	{
 
 		if ($value==$counter)
 		{
 			echo "<option selected value='$counter'>$ts</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$counter'>$ts</option>\n";
 		}
@@ -1722,14 +1941,14 @@ function decseps_list_row($label, $name, $value)
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
 	$counter = 0;
-	foreach ($decseps as $ds) 
+	foreach ($decseps as $ds)
 	{
 
 		if ($value==$counter)
 		{
 			echo "<option selected value='$counter'>$ds</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$counter'>$ds</option>\n";
 		}
@@ -1747,14 +1966,14 @@ function themes_list_row($label, $name, $value)
 
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	foreach ($themes as $th) 
+	foreach ($themes as $th)
 	{
 
 		if ($value==$th)
 		{
 			echo "<option selected value='$th'>$th</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$th'>$th</option>\n";
 		}
@@ -1771,14 +1990,14 @@ function pagesizes_list_row($label, $name, $value)
 
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	foreach ($pagesizes as $pz) 
+	foreach ($pagesizes as $pz)
 	{
 
 		if ($value==$pz)
 		{
 			echo "<option selected value='$pz'>$pz</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$pz'>$pz</option>\n";
 		}
@@ -1796,14 +2015,14 @@ function security_headings_list_row($label, $name, $value)
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? 0 : (int)$_POST[$name]);
 	$counter=0;
-	foreach ($security_headings as $sh) 
+	foreach ($security_headings as $sh)
 	{
 
 		if ($value==$counter)
 		{
 			echo "<option selected value='$counter'>$sh</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$counter'>$sh</option>\n";
 		}
@@ -1819,7 +2038,7 @@ function systypes_list_cells($label, $name, $value, $submit_on_change=false)
 	if ($label != null)
 		echo "<td>$label</td>\n";
     echo "<td><select name='$name'";
-    if (submit_on_change)
+    if ($submit_on_change)
     	echo " onchange='this.form.submit();'>";
     else
     	echo ">";
@@ -1831,8 +2050,8 @@ function systypes_list_cells($label, $name, $value, $submit_on_change=false)
 		if ($value==$key)
 		{
 			echo "<option selected value='$key'>".$type['name']."</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$key'>".$type['name']."</option>\n";
 		}
@@ -1849,12 +2068,13 @@ function systypes_list_row($label, $name, $value, $submit_on_change=false)
 
 function cust_allocations_list_cells($label, $name, $selected)
 {
+	global $all_items;
 	if ($label != null)
 		label_cell($label);
 	if ($selected == null)
 		$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	echo "<td><select name='$name'>";
-	echo "<option " . ($selected == reserved_words::get_all()?" selected ":"") . " value='" . reserved_words::get_all(). "'>" . _("All Types"). "</option>\n";
+	echo "<option " . ($selected == $all_items ? " selected " : "") . " value='$all_items'>" . _("All Types"). "</option>\n";
 	echo "<option " . ($selected == '1'?" selected ":"") . " value='1'>" . _("Sales Invoices"). "</option>\n";
 	echo "<option " . ($selected == '2'?" selected ":"") . " value='2'>" . _("Overdue Invoices"). "</option>\n";
 	echo "<option " . ($selected == '3'?" selected ":"") . " value='3'>" . _("Payments"). "</option>\n";
@@ -1864,10 +2084,11 @@ function cust_allocations_list_cells($label, $name, $selected)
 
 function supp_allocations_list_cells($name, $selected)
 {
+	global $all_items;
 	if ($selected == null)
 		$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 	echo "<td><select name='$name'>";
-	echo "<option " . ($selected == reserved_words::get_all()?" selected ":"") . " value='" . reserved_words::get_all(). "'>" . _("All Types"). "</option>\n";
+	echo "<option " . ($selected == $all_items ? " selected " : "") . " value='$all_items'>" . _("All Types"). "</option>\n";
 	echo "<option " . ($selected == '1'?" selected ":"") . " value='1'>" . _("Invoices"). "</option>\n";
 	echo "<option " . ($selected == '2'?" selected ":"") . " value='2'>" . _("Overdue Invoices"). "</option>\n";
 	echo "<option " . ($selected == '3'?" selected ":"") . " value='3'>" . _("Payments"). "</option>\n";
@@ -1881,9 +2102,9 @@ function policy_list_cells($label, $name, $selected)
 	if ($selected == null)
 	{
 		$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-		if ($selected == "")	
+		if ($selected == "")
 			$_POST[$name] = $selected;
-	}		
+	}
 	if ($label != null)
 		label_cell($label);
 	echo "<td><select name='$name'>";
@@ -1904,9 +2125,9 @@ function credit_type_list_cells($label, $name, $selected, $submit_on_change=fals
 	if ($selected == null)
 	{
 		$selected = (!isset($_POST[$name]) ? "Return" : $_POST[$name]);
-		if ($selected == "Return")	
+		if ($selected == "Return")
 			$_POST[$name] = $selected;
-	}		
+	}
 	if ($label != null)
 		label_cell($label);
     echo "<td><select name='$name'";
@@ -1931,9 +2152,9 @@ function number_list($name, $selected, $from, $to, $firstlabel="")
 	if ($selected == null)
 	{
 		$selected = (!isset($_POST[$name]) ? $from : $_POST[$name]);
-		if ($selected == $from)	
+		if ($selected == $from)
 			$_POST[$name] = $selected;
-	}		
+	}
 	echo "<select name='$name'>";
 	for ($i = $from; $i <= $to; $i++)
     {
@@ -1944,8 +2165,8 @@ function number_list($name, $selected, $from, $to, $firstlabel="")
 		if ($selected == $i)
 		{
 			echo "<option selected value='$i'>$label</option>\n";
-		} 
-		else 
+		}
+		else
 		{
 			echo "<option value='$i'>$label</option>\n";
 		}
@@ -1960,7 +2181,7 @@ function number_list_cells($label, $name, $selected, $from, $to)
 	echo "<td>\n";
 	number_list($name, $selected, $from, $to);
 	echo "</td>\n";
-}	
+}
 
 function number_list_row($label, $name, $selected, $from, $to)
 {
diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index da998cfe..bc3d68bd 100644
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FrontAccounting\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-07-19 16:29+0100\n"
-"Last-Translator: Joe Hunt Consulting <joe@frontaccounting.com>\n"
+"PO-Revision-Date: 2008-01-25 23:42+0100\n"
+"Last-Translator: Joe Hunt <joe.hunt.consulting@gmail.com>\n"
 "Language-Team: Translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -15,62 +15,62 @@ msgstr ""
 "X-Poedit-SearchPath-0: c:\\Apache2\\htdocs\\account\n"
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "ea."
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "m"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "kgg"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "tons"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "l"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "lbs"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "dozen"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "pack"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:59
-#: c:\Apache2\htdocs\account/config.php:65
+#: c:\Apache2\htdocs\account/config.php:66
 msgid "hrs"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:118
-#: c:\Apache2\htdocs\account/config.php:147
+#: c:\Apache2\htdocs\account/config.php:159
 msgid "Inquiries"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:119
-#: c:\Apache2\htdocs\account/config.php:148
+#: c:\Apache2\htdocs\account/config.php:160
 msgid "Accountant"
 msgstr ""
 
 # c:\Apache2\htdocs\account/config.php:120
-#: c:\Apache2\htdocs\account/config.php:149
+#: c:\Apache2\htdocs\account/config.php:161
 msgid "System Administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid "Logout"
 msgstr ""
 
 # c:\Apache2\htdocs\account/access/login.php:38
-#: c:\Apache2\htdocs\account/access/login.php:40
+#: c:\Apache2\htdocs\account/access/login.php:43
 msgid "Version"
 msgstr ""
 
@@ -228,38 +228,38 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:36
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:42
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:49
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:56
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:62
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:70
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:77
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:84
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:89
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:92
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:99
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:106
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:110
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:115
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:121
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:129
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:132
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:144
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:149
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:161
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:166
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:173
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:181
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:188
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:198
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:202
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:208
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:215
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:221
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:230
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:233
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:238
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:244
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:249
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:255
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:57
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:63
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:71
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:78
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:85
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:90
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:93
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:100
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:107
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:111
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:116
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:122
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:130
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:133
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:145
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:150
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:162
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:167
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:174
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:182
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:189
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:199
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:203
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:209
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:216
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:222
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:231
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:234
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:239
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:245
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:250
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:256
 #: c:\Apache2\htdocs\account/sales/view/view_sales_order.php:63
 #: c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:238
 msgid "Comments"
@@ -274,7 +274,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/admin/backups.php:162
 #: c:\Apache2\htdocs\account/admin/backups.php:145
 #: c:\Apache2\htdocs\account/admin/backups.php:162
-#: c:\Apache2\htdocs\account/admin/inst_module.php:254
+#: c:\Apache2\htdocs\account/admin/inst_module.php:265
 msgid "Filename"
 msgstr ""
 
@@ -319,7 +319,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/admin/backups.php:238
 #: c:\Apache2\htdocs\account/admin/create_coy.php:167
 #: c:\Apache2\htdocs\account/admin/fiscalyears.php:140
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:255
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:263
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:146
 #: c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:108
 #: c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:133
@@ -328,7 +328,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/taxes/item_tax_types.php:114
 #: c:\Apache2\htdocs\account/taxes/tax_groups.php:156
 #: c:\Apache2\htdocs\account/taxes/tax_types.php:109
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1473
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1686
 msgid "No"
 msgstr ""
 
@@ -413,7 +413,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/manage/locations.php:170
 #: c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:185
 #: c:\Apache2\htdocs\account/sales/manage/customers.php:274
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:365
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:375
 msgid "Address:"
 msgstr ""
 
@@ -492,7 +492,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/admin/forms_setup.php:45
 #: c:\Apache2\htdocs\account/admin/gl_setup.php:191
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:247
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:248
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:246
 #: c:\Apache2\htdocs\account/inventory/adjustments.php:228
 #: c:\Apache2\htdocs\account/inventory/cost_update.php:112
 #: c:\Apache2\htdocs\account/inventory/reorder_level.php:78
@@ -512,9 +512,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:158
 #: c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:142
 #: c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:125
-#: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:319
+#: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:328
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:212
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:326
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:336
 msgid "Update"
 msgstr ""
 
@@ -550,7 +550,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/admin/create_coy.php:73
 #: c:\Apache2\htdocs\account/admin/create_coy.php:128
 #: c:\Apache2\htdocs\account/admin/inst_lang.php:136
-#: c:\Apache2\htdocs\account/admin/inst_module.php:168
+#: c:\Apache2\htdocs\account/admin/inst_module.php:169
 msgid " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:159
 #: c:\Apache2\htdocs\account/admin/create_coy.php:165
 #: c:\Apache2\htdocs\account/admin/fiscalyears.php:144
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:253
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:261
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:146
 #: c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:112
 #: c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:133
@@ -650,7 +650,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/taxes/item_tax_types.php:118
 #: c:\Apache2\htdocs\account/taxes/tax_groups.php:154
 #: c:\Apache2\htdocs\account/taxes/tax_types.php:107
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1465
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1678
 #: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:164
 msgid "Yes"
 msgstr ""
@@ -678,8 +678,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/admin/inst_lang.php:259
 # c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:154
 #: c:\Apache2\htdocs\account/admin/create_coy.php:181
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:259
-#: c:\Apache2\htdocs\account/admin/inst_module.php:269
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:267
+#: c:\Apache2\htdocs\account/admin/inst_module.php:280
 #: c:\Apache2\htdocs\account/gl/gl_budget.php:170
 #: c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:154
 msgid "Delete"
@@ -733,8 +733,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/admin/inst_lang.php:312
 # c:\Apache2\htdocs\account/includes/ui/ui_input.inc:45
 #: c:\Apache2\htdocs\account/admin/create_coy.php:258
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:312
-#: c:\Apache2\htdocs\account/admin/inst_module.php:317
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:321
+#: c:\Apache2\htdocs\account/admin/inst_module.php:329
 #: c:\Apache2\htdocs\account/gl/gl_budget.php:169
 #: c:\Apache2\htdocs\account/includes/ui/ui_input.inc:45
 msgid "Save"
@@ -842,8 +842,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/admin/inst_lang.php:236
 # c:\Apache2\htdocs\account/admin/inst_lang.php:302
 #: c:\Apache2\htdocs\account/admin/display_prefs.php:80
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:236
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:302
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:244
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:310
 msgid "Language"
 msgstr ""
 
@@ -1195,7 +1195,7 @@ msgid "The language file "
 msgstr ""
 
 # c:\Apache2\htdocs\account/admin/inst_lang.php:230
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:230
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:238
 msgid "Are you sure you want to delete language no. "
 msgstr ""
 
@@ -1217,10 +1217,10 @@ msgstr ""
 # c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197
 # c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
 # c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:236
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:303
-#: c:\Apache2\htdocs\account/admin/inst_module.php:254
-#: c:\Apache2\htdocs\account/admin/inst_module.php:310
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:244
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:311
+#: c:\Apache2\htdocs\account/admin/inst_module.php:265
+#: c:\Apache2\htdocs\account/admin/inst_module.php:321
 #: c:\Apache2\htdocs\account/admin/shipping_companies.php:104
 #: c:\Apache2\htdocs\account/dimensions/dimension_entry.php:232
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:100
@@ -1242,35 +1242,35 @@ msgstr ""
 
 # c:\Apache2\htdocs\account/admin/inst_lang.php:236
 # c:\Apache2\htdocs\account/admin/inst_lang.php:304
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:236
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:304
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:244
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:312
 msgid "Encoding"
 msgstr ""
 
 # c:\Apache2\htdocs\account/admin/inst_lang.php:236
 # c:\Apache2\htdocs\account/admin/inst_lang.php:306
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:236
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:306
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:244
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:314
 msgid "Right To Left"
 msgstr ""
 
 # c:\Apache2\htdocs\account/admin/inst_lang.php:264
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:264
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:272
 msgid "The marked language is the current language which cannot be deleted."
 msgstr ""
 
 # c:\Apache2\htdocs\account/admin/inst_lang.php:308
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:308
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:316
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:317
 msgid "Language File"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:311
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:311
-msgid "Select your language MO file from your local harddisk."
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:320
+msgid "Select your language files from your local harddisk."
 msgstr ""
 
 # c:\Apache2\htdocs\account/admin/inst_lang.php:341
-#: c:\Apache2\htdocs\account/admin/inst_lang.php:341
+#: c:\Apache2\htdocs\account/admin/inst_lang.php:350
 msgid "Create a new language"
 msgstr ""
 
@@ -1282,7 +1282,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/applications/customers.php:7
 # c:\Apache2\htdocs\account/sales/manage/customer_branches.php:277
 # c:\Apache2\htdocs\account/includes/page/header.inc:42
-#: c:\Apache2\htdocs\account/admin/inst_module.php:15
+#: c:\Apache2\htdocs\account/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account/applications/customers.php:9
 #: c:\Apache2\htdocs\account/sales/manage/customer_branches.php:277
 #: c:\Apache2\htdocs\account/includes/page/header.inc:52
@@ -1291,7 +1291,7 @@ msgstr ""
 
 # c:\Apache2\htdocs\account/applications/suppliers.php:7
 # c:\Apache2\htdocs\account/includes/page/header.inc:43
-#: c:\Apache2\htdocs\account/admin/inst_module.php:15
+#: c:\Apache2\htdocs\account/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account/applications/suppliers.php:9
 #: c:\Apache2\htdocs\account/includes/page/header.inc:53
 msgid "Purchases"
@@ -1299,7 +1299,7 @@ msgstr ""
 
 # c:\Apache2\htdocs\account/applications/inventory.php:7
 # c:\Apache2\htdocs\account/includes/page/header.inc:44
-#: c:\Apache2\htdocs\account/admin/inst_module.php:15
+#: c:\Apache2\htdocs\account/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account/applications/inventory.php:9
 #: c:\Apache2\htdocs\account/includes/page/header.inc:54
 msgid "Items and Inventory"
@@ -1307,7 +1307,7 @@ msgstr ""
 
 # c:\Apache2\htdocs\account/applications/manufacturing.php:7
 # c:\Apache2\htdocs\account/includes/page/header.inc:45
-#: c:\Apache2\htdocs\account/admin/inst_module.php:15
+#: c:\Apache2\htdocs\account/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account/applications/manufacturing.php:9
 #: c:\Apache2\htdocs\account/includes/page/header.inc:55
 msgid "Manufacturing"
@@ -1319,19 +1319,19 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:126
 # c:\Apache2\htdocs\account/reporting/reports_main.php:131
 # c:\Apache2\htdocs\account/includes/page/header.inc:46
-#: c:\Apache2\htdocs\account/admin/inst_module.php:16
+#: c:\Apache2\htdocs\account/admin/inst_module.php:17
 #: c:\Apache2\htdocs\account/applications/dimensions.php:10
 #: c:\Apache2\htdocs\account/inventory/manage/items.php:355
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:122
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:125
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:130
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:123
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:126
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:131
 #: c:\Apache2\htdocs\account/includes/page/header.inc:56
 msgid "Dimensions"
 msgstr ""
 
 # c:\Apache2\htdocs\account/applications/generalledger.php:7
 # c:\Apache2\htdocs\account/includes/page/header.inc:47
-#: c:\Apache2\htdocs\account/admin/inst_module.php:16
+#: c:\Apache2\htdocs\account/admin/inst_module.php:17
 #: c:\Apache2\htdocs\account/applications/generalledger.php:9
 #: c:\Apache2\htdocs\account/includes/page/header.inc:57
 msgid "Banking and General Ledger"
@@ -1339,50 +1339,54 @@ msgstr ""
 
 # c:\Apache2\htdocs\account/applications/setup.php:7
 # c:\Apache2\htdocs\account/includes/page/header.inc:48
-#: c:\Apache2\htdocs\account/admin/inst_module.php:16
+#: c:\Apache2\htdocs\account/admin/inst_module.php:17
 #: c:\Apache2\htdocs\account/applications/setup.php:9
 #: c:\Apache2\htdocs\account/includes/page/header.inc:58
 msgid "Setup"
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:151
+#: c:\Apache2\htdocs\account/admin/inst_module.php:152
 msgid "Cannot open the modules file - "
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:158
+#: c:\Apache2\htdocs\account/admin/inst_module.php:159
 msgid "Cannot write to the modules file - "
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:168
+#: c:\Apache2\htdocs\account/admin/inst_module.php:169
 msgid "The modules file "
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:248
+#: c:\Apache2\htdocs\account/admin/inst_module.php:259
 msgid "Are you sure you want to delete module: "
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:254
+#: c:\Apache2\htdocs\account/admin/inst_module.php:265
 msgid "Tab"
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:254
-#: c:\Apache2\htdocs\account/admin/inst_module.php:311
+#: c:\Apache2\htdocs\account/admin/inst_module.php:265
+#: c:\Apache2\htdocs\account/admin/inst_module.php:322
 msgid "Folder"
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:309
+#: c:\Apache2\htdocs\account/admin/inst_module.php:320
 msgid "Menu Tab"
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:313
+#: c:\Apache2\htdocs\account/admin/inst_module.php:324
 msgid "Module File"
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:316
+#: c:\Apache2\htdocs\account/admin/inst_module.php:325
+msgid "SQL File"
+msgstr ""
+
+#: c:\Apache2\htdocs\account/admin/inst_module.php:328
 msgid "Select your module PHP file from your local harddisk."
 msgstr ""
 
-#: c:\Apache2\htdocs\account/admin/inst_module.php:346
+#: c:\Apache2\htdocs\account/admin/inst_module.php:358
 msgid "Create a new module"
 msgstr ""
 
@@ -1762,6 +1766,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:41
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:42
 #: c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:51
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:6
 msgid "Search"
 msgstr ""
 
@@ -1830,9 +1835,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:103
 #: c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:60
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:98
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:101
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:90
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
 #: c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:60
 #: c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88
 #: c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195
@@ -1867,7 +1872,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268
 #: c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272
 #: c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
 msgid "#"
 msgstr ""
 
@@ -2076,9 +2081,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:159
 #: c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:143
 #: c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:126
-#: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:320
+#: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:329
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:213
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:327
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:337
 msgid "Cancel"
 msgstr ""
 
@@ -2121,7 +2126,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/gl/bank_transfer.php:103
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:120
 #: c:\Apache2\htdocs\account/gl/gl_journal.php:93
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:121
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:119
 #: c:\Apache2\htdocs\account/inventory/adjustments.php:108
 #: c:\Apache2\htdocs\account/inventory/transfers.php:108
 #: c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:84
@@ -2195,7 +2200,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/applications/customers.php:16
 #: c:\Apache2\htdocs\account/sales/sales_order_entry.php:27
 #: c:\Apache2\htdocs\account/sales/view/view_sales_order.php:35
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1858
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2071
 msgid "Sales Invoices"
 msgstr ""
 
@@ -2332,8 +2337,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1866
 #: c:\Apache2\htdocs\account/applications/generalledger.php:12
 #: c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:57
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1860
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1873
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2073
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2086
 msgid "Payments"
 msgstr ""
 
@@ -2380,9 +2385,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/applications/generalledger.php:22
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:18
 #: c:\Apache2\htdocs\account/reporting/rep708.php:89
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:182
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:216
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:245
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:183
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:217
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:246
 msgid "Trial Balance"
 msgstr ""
 
@@ -2732,7 +2737,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/gl/bank_transfer.php:126
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:108
 #: c:\Apache2\htdocs\account/gl/gl_journal.php:103
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:111
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:109
 #: c:\Apache2\htdocs\account/inventory/adjustments.php:97
 #: c:\Apache2\htdocs\account/inventory/transfers.php:98
 #: c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:61
@@ -2833,9 +2838,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:103
 #: c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:60
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:98
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:101
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:90
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
 #: c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89
 #: c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:60
 #: c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88
@@ -2851,7 +2856,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep704.php:66
 #: c:\Apache2\htdocs\account/reporting/rep704.php:69
 #: c:\Apache2\htdocs\account/reporting/rep709.php:178
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:148
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:149
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:121
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:124
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:163
@@ -2882,20 +2887,20 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:247
 #: c:\Apache2\htdocs\account/dimensions/dimension_entry.php:238
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:44
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:146
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:155
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:168
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:175
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:183
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:193
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:204
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:210
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:217
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:226
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:235
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:240
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:246
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:252
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:147
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:156
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:169
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:176
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:184
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:194
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:205
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:211
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:218
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:227
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:236
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:241
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:247
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:253
 msgid "Start Date"
 msgstr ""
 
@@ -3081,9 +3086,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:103
 #: c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:60
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:98
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:101
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:90
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
 #: c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:74
 #: c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:59
 #: c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:57
@@ -3132,7 +3137,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:87
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:237
 #: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:5
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
 msgid "Date"
 msgstr ""
 
@@ -3182,7 +3187,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/view/view_invoice.php:88
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:89
 #: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:12
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:346
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:356
 msgid "Due Date"
 msgstr ""
 
@@ -3207,9 +3212,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101
 #: c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:104
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:91
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:81
 #: c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128
 #: c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:131
@@ -3257,7 +3262,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/sales/customer_payments.php:24
 #: c:\Apache2\htdocs\account/gl/bank_transfer.php:21
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:25
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:27
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:25
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:21
 #: c:\Apache2\htdocs\account/purchasing/supplier_payment.php:30
 #: c:\Apache2\htdocs\account/sales/customer_payments.php:26
@@ -3354,7 +3359,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/gl/bank_transfer.php:120
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:103
 #: c:\Apache2\htdocs\account/gl/gl_journal.php:98
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:106
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:104
 #: c:\Apache2\htdocs\account/inventory/adjustments.php:91
 #: c:\Apache2\htdocs\account/inventory/transfers.php:93
 #: c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:55
@@ -3462,8 +3467,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/gl/gl_budget.php:110
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:57
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:59
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:98
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:90
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
 #: c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:56
 #: c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:59
 #: c:\Apache2\htdocs\account/inventory/manage/items.php:357
@@ -3491,22 +3496,22 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep708.php:71
 #: c:\Apache2\htdocs\account/reporting/rep708.php:73
 #: c:\Apache2\htdocs\account/reporting/rep708.php:80
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:131
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:159
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:132
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:160
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:164
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:161
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:165
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:170
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:166
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:171
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:178
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:172
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:179
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:186
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:180
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:187
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:197
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:201
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:206
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:213
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:220
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:188
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:198
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:202
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:207
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:214
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:221
 #: c:\Apache2\htdocs\account/sales/manage/customers.php:299
 #: c:\Apache2\htdocs\account/sales/manage/customers.php:301
 #: c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:110
@@ -3622,7 +3627,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:67
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:69
 msgid "Amount"
 msgstr ""
 
@@ -3730,8 +3735,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:170
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:246
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:340
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:38
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:41
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
 msgid "Total"
@@ -3747,7 +3752,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/purchasing/supplier_payment.php:30
 # c:\Apache2\htdocs\account/sales/customer_payments.php:26
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:27
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:29
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:27
 #: c:\Apache2\htdocs\account/purchasing/supplier_payment.php:32
 #: c:\Apache2\htdocs\account/sales/customer_payments.php:28
 msgid "There are no bank payment types defined in the system."
@@ -3776,21 +3781,21 @@ msgstr ""
 # c:\Apache2\htdocs\account/gl/gl_deposit.php:152
 # c:\Apache2\htdocs\account/gl/gl_payment.php:151
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:154
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:153
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:151
 msgid "The amount entered is not a valid number."
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_deposit.php:158
 # c:\Apache2\htdocs\account/gl/gl_payment.php:157
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:160
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:159
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:157
 msgid "The amount entered must be a postitive number."
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_deposit.php:164
 # c:\Apache2\htdocs\account/gl/gl_payment.php:163
 #: c:\Apache2\htdocs\account/gl/gl_deposit.php:166
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:165
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:163
 msgid "The source and destination accouts cannot be the same."
 msgstr ""
 
@@ -3882,42 +3887,42 @@ msgid "The journal must balance (debits equal to credits) before it can be proce
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:21
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:23
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:21
 msgid "Bank Account Payment Entry"
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:36
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:38
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:36
 msgid "Payment has been entered"
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:38
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:40
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:38
 msgid "View the GL Postings for this Payment"
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:40
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:42
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:40
 msgid "Enter Another Payment"
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:114
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:116
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:114
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:169
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:171
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:169
 msgid "You cannot make a payment to a bank account. Please use the transfer funds facility for this."
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:238
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:240
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:238
 msgid "Payment Items"
 msgstr ""
 
 # c:\Apache2\htdocs\account/gl/gl_payment.php:248
-#: c:\Apache2\htdocs\account/gl/gl_payment.php:250
+#: c:\Apache2\htdocs\account/gl/gl_payment.php:248
 msgid "Process Payment"
 msgstr ""
 
@@ -3971,9 +3976,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51
 # c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:91
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:83
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:85
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:87
@@ -4030,9 +4035,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51
 # c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:91
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:84
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:86
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:88
@@ -4069,9 +4074,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep704.php:66
 # c:\Apache2\htdocs\account/reporting/rep704.php:69
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:91
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
 #: c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:27
 #: c:\Apache2\htdocs\account/reporting/rep704.php:64
 #: c:\Apache2\htdocs\account/reporting/rep704.php:66
@@ -4083,8 +4088,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:105
 # c:\Apache2\htdocs\account/reporting/rep704.php:118
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:69
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:107
-#: c:\Apache2\htdocs\account/reporting/rep704.php:118
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:112
+#: c:\Apache2\htdocs\account/reporting/rep704.php:122
 msgid "Opening Balance"
 msgstr ""
 
@@ -4092,8 +4097,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:146
 # c:\Apache2\htdocs\account/reporting/rep704.php:155
 #: c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:108
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:148
-#: c:\Apache2\htdocs\account/reporting/rep704.php:155
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:153
+#: c:\Apache2\htdocs\account/reporting/rep704.php:159
 msgid "Ending Balance"
 msgstr ""
 
@@ -4128,11 +4133,6 @@ msgstr ""
 msgid "to:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:84
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:86
-msgid "No general ledger transactions have been created for this account on the selected dates."
-msgstr ""
-
 # c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
 # c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
 # c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100
@@ -4162,9 +4162,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:249
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:380
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:91
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
 #: c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:89
 #: c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:88
 #: c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:57
@@ -4190,10 +4190,15 @@ msgstr ""
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:249
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:381
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:391
 msgid "Memo"
 msgstr ""
 
+# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:84
+#: c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:160
+msgid "No general ledger transactions have been created for this account on the selected dates."
+msgstr ""
+
 # c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:27
 #: c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:31
 msgid "No zero values"
@@ -4617,7 +4622,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:143
 #: c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:7
 #: c:\Apache2\htdocs\account/reporting/rep701.php:42
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:142
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:143
 msgid "Chart of Accounts"
 msgstr ""
 
@@ -4753,9 +4758,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:231
 #: c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:97
 #: c:\Apache2\htdocs\account/reporting/rep706.php:90
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:167
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:203
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:234
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:168
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:204
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:235
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4875,8 +4880,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:95
 #: c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:62
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:51
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:64
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:94
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:65
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:95
 msgid "From"
 msgstr ""
 
@@ -5100,7 +5105,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/adjustments.php:147
 #: c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:73
 #: c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:118
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:129
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:127
 msgid "The quantity entered must be greater than zero."
 msgstr ""
 
@@ -5284,8 +5289,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:168
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:38
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:41
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
 msgid "Price"
@@ -5426,16 +5431,16 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep202.php:158
 #: c:\Apache2\htdocs\account/reporting/rep203.php:82
 #: c:\Apache2\htdocs\account/reporting/rep204.php:76
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:72
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:73
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:75
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:78
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:80
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:85
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:87
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:90
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:74
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:76
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:79
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:81
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:86
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:88
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:91
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:93
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:92
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:94
 #: c:\Apache2\htdocs\account/includes/types.inc:140
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:11
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:225
@@ -5528,9 +5533,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep301.php:91
 #: c:\Apache2\htdocs\account/reporting/rep302.php:177
 #: c:\Apache2\htdocs\account/reporting/rep303.php:130
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:104
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:109
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:113
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:105
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:110
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:114
 msgid "Location"
 msgstr ""
 
@@ -5547,6 +5552,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57
 #: c:\Apache2\htdocs\account/inventory/reorder_level.php:42
 #: c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:130
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:240
 msgid "Re-Order Level"
 msgstr ""
 
@@ -5991,8 +5998,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:38
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109
 msgid "Quantity"
@@ -6085,7 +6092,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:818
 # c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:270
 #: c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:824
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1037
 #: c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:270
 msgid "Manufactured"
 msgstr ""
@@ -6179,7 +6186,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:274
 #: c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:154
 #: c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:374
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:274
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:272
 msgid "Quantity:"
 msgstr ""
 
@@ -6256,7 +6263,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:116
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:123
 #: c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:120
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:123
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:121
 msgid "The quantity entered must be numeric."
 msgstr ""
 
@@ -6520,49 +6527,49 @@ msgid "Code"
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:177
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:177
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:175
 msgid "The selected component is already on this bom. You can modify it's quantity but it cannot appear more than once on the same bom."
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:183
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:183
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:181
 msgid "The selected component is a parent of the current item. Recursive BOMs are not allowed."
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:196
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:196
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:194
 msgid "The component item has been deleted from this bom."
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:205
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:205
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:203
 msgid "Select a manufacturable item:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:225
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:225
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:223
 msgid "Add a new Component"
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:250
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:259
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:250
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:259
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:248
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:257
 msgid "Component:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:267
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:267
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:265
 msgid "Location to Draw From:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:268
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:268
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:266
 msgid "Work Centre Added:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:277
-#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:277
+#: c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:275
 msgid "Add/Update"
 msgstr ""
 
@@ -6893,8 +6900,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70
 #: c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:36
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109
 msgid "Item Code"
@@ -6927,7 +6934,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep105.php:155
 #: c:\Apache2\htdocs\account/reporting/rep201.php:71
 #: c:\Apache2\htdocs\account/taxes/tax_types.php:99
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:47
 msgid "Outstanding"
 msgstr ""
 
@@ -7796,7 +7803,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep201.php:71
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:125
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:47
 msgid "Allocated"
 msgstr ""
 
@@ -7865,7 +7872,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:63
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:64
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:65
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:79
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:81
 msgid "Days"
 msgstr ""
 
@@ -7880,7 +7887,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep202.php:147
 #: c:\Apache2\htdocs\account/reporting/rep202.php:177
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:65
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:80
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:82
 msgid "Over"
 msgstr ""
 
@@ -7902,7 +7909,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep202.php:151
 #: c:\Apache2\htdocs\account/reporting/rep202.php:261
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:68
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:75
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:77
 msgid "Current"
 msgstr ""
 
@@ -7915,7 +7922,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep102.php:143
 #: c:\Apache2\htdocs\account/reporting/rep202.php:152
 #: c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:69
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:76
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:78
 msgid "Total Balance"
 msgstr ""
 
@@ -8075,8 +8082,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70
 #: c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:36
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109
 msgid "Item Description"
@@ -8087,7 +8094,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
 #: c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27
 #: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:10
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:38
 msgid "Delivery Date"
 msgstr ""
 
@@ -8113,8 +8120,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70
 #: c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:44
 #: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:38
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:41
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
 msgid "Unit"
@@ -8241,7 +8248,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:68
 #: c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:64
 #: c:\Apache2\htdocs\account/sales/view/view_invoice.php:153
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:68
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:70
 msgid "TOTAL INVOICE"
 msgstr ""
 
@@ -8303,7 +8310,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep201.php:70
 #: c:\Apache2\htdocs\account/reporting/rep203.php:75
 #: c:\Apache2\htdocs\account/reporting/rep709.php:171
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
 msgid "Trans Type"
 msgstr ""
 
@@ -8312,7 +8319,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
 #: c:\Apache2\htdocs\account/reporting/rep101.php:69
 #: c:\Apache2\htdocs\account/reporting/rep201.php:70
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
 msgid "Charges"
 msgstr ""
 
@@ -8321,7 +8328,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
 #: c:\Apache2\htdocs\account/reporting/rep101.php:69
 #: c:\Apache2\htdocs\account/reporting/rep201.php:71
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:47
 msgid "Credits"
 msgstr ""
 
@@ -8358,23 +8365,23 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:22
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:27
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:45
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:74
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:79
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:86
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:147
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:156
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:169
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:176
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:184
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:194
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:205
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:211
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:218
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:227
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:236
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:241
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:247
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:253
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:75
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:80
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:87
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:148
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:157
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:170
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:177
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:185
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:195
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:206
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:212
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:219
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:228
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:237
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:242
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:248
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:254
 msgid "End Date"
 msgstr ""
 
@@ -8412,9 +8419,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:37
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:43
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:50
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:57
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:58
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:63
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:59
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:64
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:250
 #: c:\Apache2\htdocs\account/sales/customer_invoice.php:315
 #: c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62
@@ -8460,8 +8467,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep202.php:133
 #: c:\Apache2\htdocs\account/reporting/rep709.php:149
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:30
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:82
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:254
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:83
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:255
 msgid "Summary Only"
 msgstr ""
 
@@ -8472,7 +8479,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep102.php:126
 #: c:\Apache2\htdocs\account/reporting/rep202.php:135
 #: c:\Apache2\htdocs\account/reporting/rep709.php:151
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:105
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:106
 msgid "Detailed Report"
 msgstr ""
 
@@ -8699,10 +8706,10 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep107.php:84
 # c:\Apache2\htdocs\account/reporting/rep107.php:95
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:32
-#: c:\Apache2\htdocs\account/reporting/rep107.php:59
-#: c:\Apache2\htdocs\account/reporting/rep107.php:84
-#: c:\Apache2\htdocs\account/reporting/rep107.php:95
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:32
+#: c:\Apache2\htdocs\account/reporting/rep107.php:60
+#: c:\Apache2\htdocs\account/reporting/rep107.php:86
+#: c:\Apache2\htdocs\account/reporting/rep107.php:97
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:33
 msgid "INVOICE"
 msgstr ""
 
@@ -8710,10 +8717,10 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep107.php:95
 # c:\Apache2\htdocs\account/sales/view/view_credit.php:30
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:34
-#: c:\Apache2\htdocs\account/reporting/rep107.php:89
-#: c:\Apache2\htdocs\account/reporting/rep107.php:95
+#: c:\Apache2\htdocs\account/reporting/rep107.php:91
+#: c:\Apache2\htdocs\account/reporting/rep107.php:97
 #: c:\Apache2\htdocs\account/sales/view/view_credit.php:30
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:34
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:35
 msgid "CREDIT NOTE"
 msgstr ""
 
@@ -8722,15 +8729,15 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:44
 #: c:\Apache2\htdocs\account/reporting/rep108.php:72
 #: c:\Apache2\htdocs\account/reporting/rep108.php:99
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:44
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
 msgid "STATEMENT"
 msgstr ""
 
 #: c:\Apache2\htdocs\account/reporting/rep109.php:72
 #: c:\Apache2\htdocs\account/reporting/rep109.php:91
 #: c:\Apache2\htdocs\account/reporting/rep109.php:102
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:30
-#: c:\Apache2\htdocs\account/reporting/includes/doctext2.inc:30
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:31
+#: c:\Apache2\htdocs\account/reporting/includes/doctext2.inc:31
 msgid "QUOTE"
 msgstr ""
 
@@ -8740,8 +8747,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep109.php:74
 #: c:\Apache2\htdocs\account/reporting/rep109.php:96
 #: c:\Apache2\htdocs\account/reporting/rep109.php:102
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:30
-#: c:\Apache2\htdocs\account/reporting/includes/doctext2.inc:30
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:31
+#: c:\Apache2\htdocs\account/reporting/includes/doctext2.inc:31
 msgid "SALES ORDER"
 msgstr ""
 
@@ -8753,7 +8760,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep201.php:82
 # c:\Apache2\htdocs\account/reporting/reports_main.php:71
 #: c:\Apache2\htdocs\account/reporting/rep201.php:80
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:73
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:74
 msgid "Supplier Balances"
 msgstr ""
 
@@ -8770,7 +8777,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep203.php:87
 # c:\Apache2\htdocs\account/reporting/reports_main.php:84
 #: c:\Apache2\htdocs\account/reporting/rep203.php:85
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:85
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:86
 msgid "Payment Report"
 msgstr ""
 
@@ -8804,7 +8811,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep204.php:80
 # c:\Apache2\htdocs\account/reporting/reports_main.php:90
 #: c:\Apache2\htdocs\account/reporting/rep204.php:78
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:90
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:91
 msgid "Outstanding GRNs Report"
 msgstr ""
 
@@ -8814,14 +8821,14 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep209.php:79
 #: c:\Apache2\htdocs\account/reporting/rep209.php:94
 #: c:\Apache2\htdocs\account/reporting/rep209.php:99
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:28
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:29
 msgid "PURCHASE ORDER"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/rep301.php:93
 # c:\Apache2\htdocs\account/reporting/reports_main.php:103
 #: c:\Apache2\htdocs\account/reporting/rep301.php:93
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:102
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:103
 msgid "Inventory Valuation Report"
 msgstr ""
 
@@ -8848,7 +8855,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep302.php:179
 # c:\Apache2\htdocs\account/reporting/reports_main.php:108
 #: c:\Apache2\htdocs\account/reporting/rep302.php:179
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:107
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:108
 msgid "Inventory Planning Report"
 msgstr ""
 
@@ -8860,7 +8867,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep303.php:137
 # c:\Apache2\htdocs\account/reporting/reports_main.php:112
 #: c:\Apache2\htdocs\account/reporting/rep303.php:137
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:111
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:112
 msgid "Stock Check Sheets"
 msgstr ""
 
@@ -8872,7 +8879,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep401.php:67
 # c:\Apache2\htdocs\account/reporting/reports_main.php:119
 #: c:\Apache2\htdocs\account/reporting/rep401.php:67
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:118
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:119
 msgid "Bill of Material Listing"
 msgstr ""
 
@@ -8884,7 +8891,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep501.php:82
 # c:\Apache2\htdocs\account/reporting/reports_main.php:126
 #: c:\Apache2\htdocs\account/reporting/rep501.php:82
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:125
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:126
 msgid "Dimension Summary"
 msgstr ""
 
@@ -8906,7 +8913,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep702.php:49
 # c:\Apache2\htdocs\account/reporting/reports_main.php:146
 #: c:\Apache2\htdocs\account/reporting/rep702.php:49
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:145
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:146
 msgid "List of Journal Entries"
 msgstr ""
 
@@ -8915,9 +8922,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:191
 # c:\Apache2\htdocs\account/reporting/reports_main.php:222
 #: c:\Apache2\htdocs\account/reporting/rep704.php:30
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:154
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:192
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:225
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:155
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:193
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:226
 msgid "GL Account Transactions"
 msgstr ""
 
@@ -8930,9 +8937,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/rep705.php:135
 #: c:\Apache2\htdocs\account/reporting/rep705.php:147
 #: c:\Apache2\htdocs\account/reporting/rep705.php:157
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:163
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:200
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:232
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:164
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:201
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:233
 msgid "Year"
 msgstr ""
 
@@ -8959,9 +8966,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:198
 # c:\Apache2\htdocs\account/reporting/reports_main.php:228
 #: c:\Apache2\htdocs\account/reporting/rep705.php:163
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:162
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:199
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:231
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:163
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:200
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:232
 msgid "Annual Expense Breakdown"
 msgstr ""
 
@@ -8996,7 +9003,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep707.php:70
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163
 #: c:\Apache2\htdocs\account/reporting/rep707.php:78
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:168
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
 msgid "Accumulated"
 msgstr ""
 
@@ -9008,14 +9015,14 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/rep707.php:103
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163
 #: c:\Apache2\htdocs\account/reporting/rep707.php:111
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:168
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
 msgid "Budget"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/rep707.php:112
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163
 #: c:\Apache2\htdocs\account/reporting/rep707.php:120
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:168
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
 msgid "Period Y-1"
 msgstr ""
 
@@ -9024,16 +9031,16 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:207
 # c:\Apache2\htdocs\account/reporting/reports_main.php:235
 #: c:\Apache2\htdocs\account/reporting/rep707.php:123
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:174
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:209
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:239
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:175
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:210
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:240
 msgid "Profit and Loss Statement"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/rep709.php:140
 # c:\Apache2\htdocs\account/reporting/reports_main.php:246
 #: c:\Apache2\htdocs\account/reporting/rep709.php:140
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:251
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:252
 msgid "Tax Report"
 msgstr ""
 
@@ -9111,12 +9118,12 @@ msgstr ""
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:24
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:29
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:53
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:59
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:66
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:76
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:81
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:88
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:96
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:60
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:67
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:77
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:82
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:89
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:97
 msgid "Currency Filter"
 msgstr ""
 
@@ -9129,13 +9136,13 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:240
 # c:\Apache2\htdocs\account/reporting/reports_main.php:246
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:31
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:83
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:172
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:180
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:207
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:214
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:237
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:243
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:84
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:173
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:181
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:208
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:215
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:238
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:244
 msgid "Graphics"
 msgstr ""
 
@@ -9161,16 +9168,16 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:113
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:38
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:46
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:103
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:108
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:112
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:104
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:109
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:113
 msgid "Inventory Category"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:39
 # c:\Apache2\htdocs\account/reporting/reports_main.php:115
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:40
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:114
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:115
 msgid "Show Pictures"
 msgstr ""
 
@@ -9188,8 +9195,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:64
 # c:\Apache2\htdocs\account/reporting/reports_main.php:96
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:52
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:65
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:95
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:66
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:96
 msgid "To"
 msgstr ""
 
@@ -9199,9 +9206,9 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:98
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:24
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:54
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:60
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:67
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:97
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:61
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:68
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:98
 #: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:24
 msgid "Bank Account"
 msgstr ""
@@ -9211,36 +9218,40 @@ msgstr ""
 msgid "email Customers"
 msgstr ""
 
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:56
+msgid "Payment Link"
+msgstr ""
+
 # c:\Apache2\htdocs\account/reporting/reports_main.php:56
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:57
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:58
 msgid "Print Statements"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:60
 # c:\Apache2\htdocs\account/reporting/reports_main.php:67
 # c:\Apache2\htdocs\account/reporting/reports_main.php:99
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:61
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:68
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:98
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:62
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:69
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:99
 msgid "Email Customers"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:62
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:63
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:64
 msgid "Print Sales Orders"
 msgstr ""
 
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:69
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:70
 msgid "Print as Quote"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:77
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:78
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:79
 msgid "Aged Supplier Analyses"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:94
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:93
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:94
 msgid "Print Purchase Orders"
 msgstr ""
 
@@ -9248,52 +9259,52 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:103
 # c:\Apache2\htdocs\account/reporting/reports_main.php:108
 # c:\Apache2\htdocs\account/reporting/reports_main.php:112
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:101
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:102
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:107
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:111
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:103
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:108
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:112
 msgid "Inventory"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:118
 # c:\Apache2\htdocs\account/reporting/reports_main.php:119
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:117
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:118
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:119
 msgid "Manufactoring"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:120
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:119
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:120
 msgid "From component"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:121
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:120
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:121
 msgid "To component"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:127
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:126
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:127
 msgid "From Dimension"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:128
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:127
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:128
 msgid "To Dimension"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:129
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:128
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:129
 msgid "Show Balance"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:131
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:130
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:131
 msgid "Dimension Details"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:135
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:134
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:135
 msgid "Banking"
 msgstr ""
 
@@ -9316,66 +9327,66 @@ msgstr ""
 # c:\Apache2\htdocs\account/reporting/reports_main.php:235
 # c:\Apache2\htdocs\account/reporting/reports_main.php:240
 # c:\Apache2\htdocs\account/reporting/reports_main.php:246
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:141
 #: c:\Apache2\htdocs\account/reporting/reports_main.php:142
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:145
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:154
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:162
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:167
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:174
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:182
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:192
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:199
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:203
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:209
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:216
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:225
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:231
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:234
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:239
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:245
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:251
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:143
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:146
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:155
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:163
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:168
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:175
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:183
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:193
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:200
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:204
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:210
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:217
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:226
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:232
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:235
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:240
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:246
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:252
 msgid "General Ledger"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:144
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:143
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:144
 msgid "Show Balances"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:158
 # c:\Apache2\htdocs\account/reporting/reports_main.php:194
 # c:\Apache2\htdocs\account/reporting/reports_main.php:225
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:157
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:195
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:228
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:158
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:196
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:229
 msgid "From Account"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:159
 # c:\Apache2\htdocs\account/reporting/reports_main.php:195
 # c:\Apache2\htdocs\account/reporting/reports_main.php:226
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:158
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:196
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:229
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:159
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:197
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:230
 msgid "To Account"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:177
 # c:\Apache2\htdocs\account/reporting/reports_main.php:210
 # c:\Apache2\htdocs\account/reporting/reports_main.php:238
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:177
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:212
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:242
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:178
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:213
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:243
 msgid "Compare to"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/reports_main.php:184
 # c:\Apache2\htdocs\account/reporting/reports_main.php:216
 # c:\Apache2\htdocs\account/reporting/reports_main.php:243
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:185
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:219
-#: c:\Apache2\htdocs\account/reporting/reports_main.php:248
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:186
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:220
+#: c:\Apache2\htdocs\account/reporting/reports_main.php:249
 msgid "Zero values"
 msgstr ""
 
@@ -9507,7 +9518,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:286
 #: c:\Apache2\htdocs\account/sales/view/view_credit.php:82
 #: c:\Apache2\htdocs\account/sales/view/view_invoice.php:104
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:41
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
 msgid "Discount %"
@@ -9526,7 +9537,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:323
 #: c:\Apache2\htdocs\account/sales/customer_invoice.php:459
 #: c:\Apache2\htdocs\account/sales/view/view_invoice.php:144
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:64
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:66
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:147
 msgid "Sub-total"
 msgstr ""
@@ -9550,7 +9561,7 @@ msgstr ""
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1911
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:349
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:354
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1918
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2131
 msgid "Items Written Off"
 msgstr ""
 
@@ -9561,7 +9572,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:350
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:355
 #: c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:369
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1917
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2130
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
@@ -10544,7 +10555,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/sales/view/view_credit.php:129
 #: c:\Apache2\htdocs\account/sales/view/view_invoice.php:146
 #: c:\Apache2\htdocs\account/sales/view/view_sales_order.php:168
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:65
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:67
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:152
 msgid "Shipping"
 msgstr ""
@@ -10659,8 +10670,8 @@ msgstr ""
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1854
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1867
 #: c:\Apache2\htdocs\account/sales/view/view_sales_order.php:37
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1861
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1874
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2074
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2087
 msgid "Credit Notes"
 msgstr ""
 
@@ -10956,9 +10967,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:163
 #: c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:147
 #: c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:130
-#: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:324
+#: c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:333
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:217
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:331
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:341
 msgid "Add Item"
 msgstr ""
 
@@ -11146,25 +11157,25 @@ msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:28
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:32
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:28
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:32
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:71
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:75
 msgid "All Suppliers"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:103
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:107
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:103
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:107
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:185
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:189
 msgid "All Customers"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:186
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:186
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:267
 msgid "All Branches"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:256
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:256
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:337
 msgid "All Locations"
 msgstr ""
 
@@ -11176,65 +11187,64 @@ msgstr ""
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:757
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:770
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:799
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:542
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:546
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:617
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:621
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:732
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:763
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:776
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:805
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:668
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:672
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:742
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:746
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:857
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:888
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1018
 msgid "All Items"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:819
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:825
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1038
 msgid "Purchased"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:820
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:826
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1039
 msgid "Service"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1160
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1164
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1166
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1170
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1379
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1383
 msgid "All Work Centres"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1850
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1863
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1857
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1870
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2070
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2083
 msgid "All Types"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1852
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1865
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1859
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1872
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2072
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2085
 msgid "Overdue Invoices"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1864
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1871
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2084
 msgid "Invoices"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1868
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1875
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2088
 msgid "Overdue Credit Notes"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1883
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1890
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2103
 msgid "Automatically put balance on back order"
 msgstr ""
 
 # c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1884
-#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1891
+#: c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:2104
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
@@ -11260,7 +11270,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account/includes/ui/ui_view.inc:394
 #: c:\Apache2\htdocs\account/includes/ui/ui_view.inc:410
 #: c:\Apache2\htdocs\account/includes/ui/ui_view.inc:428
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:66
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:68
 msgid "Included"
 msgstr ""
 
@@ -11665,58 +11675,63 @@ msgstr ""
 msgid "Phone/Fax/Email"
 msgstr ""
 
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:25
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:55
+msgid "You can pay through"
+msgstr ""
+
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
 msgid "DueDate"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:51
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:51
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:52
 msgid "Dear Sirs"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:52
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:52
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:53
 msgid "Attached you will find "
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:53
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:53
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:54
 msgid "Kindest regards"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:57
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:57
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:59
 msgid "Invoice no."
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:58
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:58
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:60
 msgid "Order no."
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:69
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:69
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:71
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:70
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:70
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:72
 msgid "TOTAL PO EX VAT"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:74
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:74
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:76
 msgid "Outstanding Transactions"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:77
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:77
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:79
 msgid "Statement"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/doctext.inc:78
-#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:78
+#: c:\Apache2\htdocs\account/reporting/includes/doctext.inc:80
 msgid "as of"
 msgstr ""
 
@@ -11783,12 +11798,12 @@ msgid "Page"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:656
-#: c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:656
+#: c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:694
 msgid "sent to"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:658
-#: c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:658
+#: c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:696
 msgid "NOT sent to"
 msgstr ""
 
@@ -11812,97 +11827,101 @@ msgstr ""
 msgid "No Currency Filter"
 msgstr ""
 
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:168
+msgid "No Payment Link"
+msgstr ""
+
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
 msgid "No Graphics"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
 msgid "Vertical bars"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
 msgid "Horizontal bars"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
 msgid "Dots"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
 msgid "Lines"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
 msgid "Pie"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
 msgid "Donut"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:180
 msgid "No Type Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:177
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:186
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:190
 msgid "No Account Group Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:194
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:202
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:210
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:203
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:211
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:219
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:207
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:215
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:223
 msgid "No Dimension Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:216
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:225
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:229
 msgid "No Customer Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:233
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:233
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:237
 msgid "No Supplier Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:225
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:238
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:242
 msgid "IV"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:226
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:239
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:243
 msgid "CN"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:250
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:263
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:267
 msgid "No Location Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:254
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:267
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:271
 msgid "No Category Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:262
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:275
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:279
 msgid "No Area Filter"
 msgstr ""
 
 # c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:266
-#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:279
+#: c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:283
 msgid "No Sales Folk Filter"
 msgstr ""
 
@@ -11911,6 +11930,21 @@ msgstr ""
 msgid "Write off"
 msgstr ""
 
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:127
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:237
+msgid "Stocks below Re-Order Level at "
+msgstr ""
+
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:130
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:240
+msgid "Below"
+msgstr ""
+
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:131
+#: c:\Apache2\htdocs\account/sales/includes/db/sales_order_db.inc:241
+msgid "Please reorder"
+msgstr ""
+
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:57
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:227
 #: c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:57
@@ -11946,52 +11980,52 @@ msgid "The selected customer and branch are not valid, or the customer does not
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:346
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:345
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:355
 msgid "Invoice Delivery Details"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:350
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:350
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:360
 msgid "Order Delivery Details"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:360
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:351
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:361
 msgid "Required Delivery Date:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:358
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:359
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:369
 msgid "Deliver from Location:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:362
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:363
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:373
 msgid "Deliver To:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:365
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:366
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:376
 msgid "Contact Phone Number:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:373
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:374
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:384
 msgid "Customer Reference:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:374
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:375
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:385
 msgid "Comments:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:376
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:377
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:387
 msgid "Shipping Charge:"
 msgstr ""
 
 # c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:378
-#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:379
+#: c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:389
 msgid "Shipping Company:"
 msgstr ""
 
diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index fa60691b..a78263a8 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -34,7 +34,7 @@ function create_new_po()
 	$_POST['OrderDate'] = Today();
 	if (!is_date_in_fiscalyear($_POST['OrderDate']))
 		$_POST['OrderDate'] = end_fiscalyear();
-	$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];	
+	$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -49,22 +49,22 @@ function display_po_header(&$order)
 	echo "<tr><td valign=center>"; // outer table
 	echo "<table>";
 
-    if ($editable) 
+    if ($editable)
     {
         if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
         	$_POST['supplier_id'] = get_global_supplier();
 
     	supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
 
-    	if ($order->supplier_id != $_POST['supplier_id']) 
+    	if ($order->supplier_id != $_POST['supplier_id'])
     	{
     		// supplier has changed
     		// delete all the order items - drastic but necessary because of
     		// change of currency, etc
     		$order->clear_items();
     	}
-	} 
-	else 
+	}
+	else
 	{
 		hidden('supplier_id', $order->supplier_id);
 		label_row(_("Supplier:"), $order->supplier_name);
@@ -82,11 +82,11 @@ function display_po_header(&$order)
 			$_POST['OrderDate']);
 	}
 
-    if ($editable) 
+    if ($editable)
     {
     	ref_row(_("Reference:"), 'ref', references::get_next(systypes::po()));
-    } 
-    else 
+    }
+    else
     {
     	hidden('ref', $order->reference);
     	label_row(_("Reference:"), $order->reference);
@@ -124,7 +124,7 @@ function display_po_header(&$order)
 	echo "</td></tr>";
 
     if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" ||
-    	isset($_POST['GetAddress']) || !isset($_POST['delivery_address']) || 
+    	isset($_POST['GetAddress']) || !isset($_POST['delivery_address']) ||
     	$_POST['delivery_address'] == "")
     {
     	/*If this is the first time the form loaded set up defaults */
@@ -140,12 +140,12 @@ function display_po_header(&$order)
     	  	$_SESSION['PO']->Location = $_POST['StkLocation'];
     	  	$_SESSION['PO']->delivery_address = $_POST['delivery_address'];
 
-        } 
-        else 
+        }
+        else
         { /*The default location of the user is crook */
     	  	echo "<br>" . _("The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record.");
         }
-    } 
+    }
 
 	textarea_row(_("Deliver to:"), 'delivery_address', $_POST['delivery_address'], 35, 4);
   	echo "</table>";
@@ -166,11 +166,11 @@ function display_po_items(&$order, $editable=true)
 
    	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
    		_("Required Delivery Date"), _("Price"), _("Line Total"));
-   	table_header($th);	
+   	table_header($th);
 
 	$total = 0;
 	$k = 0;
-   	foreach ($order->line_items as $po_line) 
+   	foreach ($order->line_items as $po_line)
    	{
 
 		if ($po_line->Deleted == false)
@@ -187,14 +187,14 @@ function display_po_items(&$order, $editable=true)
     			amount_cell($po_line->price);
                 amount_cell($line_total);
 
-                if ($editable) 
+                if ($editable)
                 {
                     edit_link_cell(SID."Edit=" . $po_line->line_no);
                     delete_link_cell(SID."Delete=" . $po_line->line_no);
                 }
         		end_row();
-			} 
-			else 
+			}
+			else
 			{
 				po_item_controls($order, $po_line->stock_id);
 			}
@@ -206,7 +206,7 @@ function display_po_items(&$order, $editable=true)
 		po_item_controls($order);
 
     $display_total = number_format2($total,user_price_dec());
-    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right", 
+    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right",
     	"nowrap align=right");
 
 	end_table(1);
@@ -236,14 +236,14 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
 	start_row();
     label_cells(_("Date"), $po->orig_order_date, "class='tableheader2'");
 
-    if ($editable) 
+    if ($editable)
     {
         if (!isset($_POST['Location']))
         	$_POST['Location'] = $po->Location;
-        label_cell(_("Deliver Into Location"), "class='tableheader2'");	
+        label_cell(_("Deliver Into Location"), "class='tableheader2'");
         locations_list_cells(null, 'Location', $_POST['Location']);
-    } 
-    else 
+    }
+    else
     {
     	label_cells(_("Deliver Into Location"), get_location_name($po->Location),
     		"class='tableheader2'");
@@ -287,15 +287,24 @@ function po_item_controls(&$order, $stock_id=null)
 		hidden('stock_id', $_POST['stock_id']);
 		label_cell($_POST['stock_id']);
 		label_cell($order->line_items[$_GET['Edit']]->item_description);
-	} 
-	else 
+	}
+	else
 	{
+		global $no_item_list;
 
 		hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-		text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
-		stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, false, "onchange='return setAccount(1, true)'");
-
+		if ($no_item_list)
+		{
+			echo "<td colspan=2>\n";
+			stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
+			echo "</td>\n";
+		}
+		else
+		{
+			text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
+			stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, false, "onchange='return setAccount(1, true)'");
+		}
     	$item_info = get_item_edit_info($_POST['stock_id']);
 		$_POST['units'] = $item_info["units"];
 
@@ -314,12 +323,12 @@ function po_item_controls(&$order, $stock_id=null)
 	$line_total = $_POST['qty'] * $_POST['price'];
 	amount_cell($line_total);
 
-	if (isset($_GET['Edit'])) 
+	if (isset($_GET['Edit']))
 	{
     	submit_cells('UpdateLine', _("Update"));
     	submit_cells('CancelUpdate', _("Cancel"));
-	} 
-	else 
+	}
+	else
 	{
 		submit_cells('EnterLine', _("Add Item"), "colspan=2");
 	}
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 3f86df5e..ea0c819d 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -9,16 +9,16 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
 {
     $already_on_order = 0;
 
-	foreach ($order->line_items AS $order_item) 
+	foreach ($order->line_items AS $order_item)
 	{
-        if (strcasecmp($order_item->stock_id, $new_item) == 0) 
+        if (strcasecmp($order_item->stock_id, $new_item) == 0)
         {
             $already_on_order = 1;
             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.");
         }
 	}
 
-	
+
     if ($already_on_order != 1)
     {
          $order->add_to_cart ($new_item, $new_item_qty, $price, $discount);
@@ -50,7 +50,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 	if ($myrow['dissallow_invoices'] == 1)
 		$ret_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
 
-	if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "") 
+	if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
 	{
 		$ret_error = _("The selected customer does not have any branches. Please create at least one branch.");
 		unset($_POST['branch_id']);
@@ -108,12 +108,12 @@ function display_order_summary($title, &$order, $editable_items=false)
 	start_table("$table_style colspan=7 width=90%");
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
 		_("Unit"), _("Price"), _("Discount %"), _("Total"), "", "");
-	table_header($th);	
+	table_header($th);
 
 	$total = 0;
 	$k = 0;  //row colour counter
 
-	foreach ($order->line_items as $stock_item) 
+	foreach ($order->line_items as $stock_item)
 	{
 
 		$line_total = $stock_item->quantity * $stock_item->price * (1 - $stock_item->discount_percent);
@@ -127,7 +127,7 @@ function display_order_summary($title, &$order, $editable_items=false)
     		alt_table_row_color($k);
 
 			view_stock_status_cell($stock_item->stock_id);
-    	 	
+
     		label_cell($stock_item->item_description);
     		qty_cell($stock_item->quantity);
     		label_cell($stock_item->units);
@@ -136,14 +136,14 @@ function display_order_summary($title, &$order, $editable_items=false)
     		amount_cell($stock_item->discount_percent * 100);
     		amount_cell($line_total);
 
-    		if ($editable_items) 
+    		if ($editable_items)
     		{
         		edit_link_cell(SID . "Edit=$stock_item->stock_id");
         		delete_link_cell(SID . "Delete=$stock_item->stock_id");
     		}
         	end_row();
-		} 
-		else 
+		}
+		else
 		{
 			sales_order_item_controls($order, $stock_item->stock_id);
 		}
@@ -176,8 +176,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	{
 		// can't change the customer/branch if items already received on this order
 		echo $order->customer_name . " - " . $order->deliver_to;
-	} 
-	else 
+	}
+	else
 	{
 
         if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all()))
@@ -188,13 +188,13 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		if (!isset($_POST['delivery_date']))
 		{
 			if ($order->direct_invoice)
-				$_POST['delivery_date'] = $_SESSION['Items']->delivery_date = 
+				$_POST['delivery_date'] = $_SESSION['Items']->delivery_date =
 					get_invoice_duedate($_POST['customer_id'], $_POST['OrderDate']);
-			else	
-				$_POST['delivery_date'] = $_SESSION['Items']->delivery_date = 
+			else
+				$_POST['delivery_date'] = $_SESSION['Items']->delivery_date =
 					add_days($_POST['OrderDate'], 10);
-		}		
-		if ($order->customer_id != $_POST['customer_id']) 
+		}
+		if ($order->customer_id != $_POST['customer_id'])
 		{
 			// customer has changed
 
@@ -211,7 +211,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		if (!isset($_POST['branch_id']))
 			$_POST['branch_id'] = "";
 		//set_global_customer($_POST['customer_id']);
-		if (($order->customer_id != $_POST['customer_id']) || 
+		if (($order->customer_id != $_POST['customer_id']) ||
 			($order->Branch != $_POST['branch_id']))
 			$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
 
@@ -225,7 +225,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	{
 		echo "<table height='5'>";
 		label_row(_("Customer Currency:"), $order->customer_currency);
-		exchange_rate_display($order->customer_currency, get_company_currency(),	
+		exchange_rate_display($order->customer_currency, get_company_currency(),
 			($editable?$_POST['OrderDate']:$order->orig_order_date), $editable);
 		echo "</table>";
 		echo "</td><td>"; // outer table
@@ -240,28 +240,28 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
 	echo "<table height='5'>";
 
-	if ($editable) 
+	if ($editable)
 	{
     	if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
     		$_POST['OrderDate'] = $order->orig_order_date;
 
 		date_row($date_text, 'OrderDate');
 	}
-	else 
+	else
 	{
 		label_row($date_text, $order->orig_order_date);
 		hidden('OrderDate', $order->orig_order_date);
 	}
 
-	if ($display_tax_group) 
+	if ($display_tax_group)
 	{
-		if ($editable) 
+		if ($editable)
 		{
             if (!isset($_POST['tax_group_id']))
             	$_POST['tax_group_id'] = $_SESSION['Items']->tax_group_id;
             tax_groups_list_row(_("Tax Group:"), 'tax_group_id', $_POST['tax_group_id'], true);
-		} 
-		else 
+		}
+		else
 		{
 			label_row(_("Tax Group:"), $order->tax_group_name);
 			hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
@@ -270,7 +270,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	echo "</table>";
 
 	echo "</td></tr>";
-	
+
 	end_table(1); // outer table
 
 	return $customer_error;
@@ -298,11 +298,21 @@ function sales_order_item_controls(&$order, $stock_id=null)
 		hidden('stock_id', $_POST['stock_id']);
 		label_cell($_POST['stock_id']);
 		label_cell($order->line_items[$stock_id]->item_description);
-	} 
-	else 
+	}
+	else
 	{
-		text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
-		stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'");
+		global $no_item_list;
+		if ($no_item_list)
+		{
+			echo "<td colspan=2>\n";
+			stock_items_list('stock_id', null, false, true);
+			echo "</td>\n";
+		}
+		else
+		{
+			text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
+			stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'");
+		}
 		$item_info = get_item_edit_info($_POST['stock_id']);
 		$_POST['units'] = $item_info["units"];
 
@@ -321,12 +331,12 @@ function sales_order_item_controls(&$order, $stock_id=null)
 	$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
 	amount_cell($line_total);
 
-	if (isset($_GET['Edit'])) 
+	if (isset($_GET['Edit']))
 	{
     	submit_cells('UpdateItem', _("Update"));
     	submit_cells('CancelItemChanges', _("Cancel"));
-	} 
-	else 
+	}
+	else
 	{
 		submit_cells('AddItem', _("Add Item"), "colspan=2");
 	}
@@ -340,12 +350,12 @@ function display_delivery_details(&$order)
 {
 	global $table_style2;
 
-	if ($order->direct_invoice) 
+	if ($order->direct_invoice)
 	{
 		$title = _("Invoice Delivery Details");
 		$delname = _("Due Date");
-	} 
-	else 
+	}
+	else
 	{
 		$title = _("Order Delivery Details");
 		$delname = _("Required Delivery Date:");
@@ -377,7 +387,7 @@ function display_delivery_details(&$order)
     text_row(_("Shipping Charge:"), 'freight_cost', $order->freight_cost, 10, 10);
 
     shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
-	if ($_SESSION['Items']->direct_invoice) 
+	if ($_SESSION['Items']->direct_invoice)
 		textarea_row(_("Memo"), 'InvoiceText', null, 31, 3);
     echo "</table>";
 
-- 
2.30.2