X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_globals.inc;h=4c14995855fbf119f3012f7e3120b688fa9f93ae;hb=f01cb25258d7b619f820d8f78e9bccf4501fc58e;hp=b591f2906f01b78221d28532034d9ca7cdd27522;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/includes/ui/ui_globals.inc b/includes/ui/ui_globals.inc
index b591f290..4c149958 100644
--- a/includes/ui/ui_globals.inc
+++ b/includes/ui/ui_globals.inc
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-include_once($path_to_root . "/includes/reserved.inc");
+//include_once($path_to_root . "/includes/reserved.inc");
 
 function set_global_supplier($supplier_id) 
 {
@@ -19,7 +19,7 @@ function set_global_supplier($supplier_id)
 function get_global_supplier($return_all=true) 
 {
 	if (!isset($_SESSION['wa_global_supplier_id']) || 
-		($return_all == false && $_SESSION['wa_global_supplier_id'] == reserved_words::get_all()))
+		($return_all == false && $_SESSION['wa_global_supplier_id'] == ALL_TEXT))
 		return "";	
 	return $_SESSION['wa_global_supplier_id'];
 }
@@ -32,7 +32,7 @@ function set_global_stock_item($stock_id)
 function get_global_stock_item($return_all=true) 
 {
 	if (!isset($_SESSION['wa_global_stock_id']) || 
-		($return_all == false && $_SESSION['wa_global_stock_id'] == reserved_words::get_all()))
+		($return_all == false && $_SESSION['wa_global_stock_id'] == ALL_TEXT))
 		return "";		
 	return $_SESSION['wa_global_stock_id'];
 }
@@ -45,7 +45,7 @@ function set_global_customer($customer_id)
 function get_global_customer($return_all=true) 
 {
 	if (!isset($_SESSION['wa_global_customer_id']) || 
-		($return_all == false && $_SESSION['wa_global_customer_id'] == reserved_words::get_all()))
+		($return_all == false && $_SESSION['wa_global_customer_id'] == ALL_TEXT))
 		return "";
 	return $_SESSION['wa_global_customer_id'];
 }
@@ -62,8 +62,10 @@ function get_global_curr_code()
 	return $_SESSION['wa_global_curr_code'];
 }
 
-
+function count_array($array)
+{
+	return (is_array($array)) ? count($array) : (($array === NULL) ? 0 : 1);
+}
 
 //--------------------------------------------------------------------------------------
 
-?>
\ No newline at end of file