From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Tue, 21 Jun 2011 13:24:08 +0000 (+0200)
Subject: Cleanup (fixed installed_extensions indlusion).
X-Git-Tag: 2.3-final~614
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=728bdff94ba97da2509ddd12e641dde5d1fbe9f8;p=fa-stable.git

Cleanup (fixed installed_extensions indlusion).
---

diff --git a/includes/session.inc b/includes/session.inc
index ae77e1ba..ea0d1d2b 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -259,6 +259,9 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 
 	login_timeout();
 
+	if (!$_SESSION["wa_current_user"]->old_db)
+		include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
+
 	install_hooks();
 
 	if (!$_SESSION["wa_current_user"]->logged_in())
@@ -293,9 +296,6 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 	} else
 		set_global_connection();
 
-	if (!$_SESSION["wa_current_user"]->old_db)
-		include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
-
 	if (!isset($_SESSION["App"])) {
 		$_SESSION["App"] = new front_accounting();
 		$_SESSION["App"]->init();
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 24396f27..67a02e66 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -319,7 +319,6 @@ function display_gl_items(&$supp_trans, $mode=0)
 
 function display_grn_items_for_selection(&$supp_trans, $k)
 {
-	global $use_invoice_adjustments;
 
 	if ($supp_trans->trans_type == ST_SUPPINVOICE)
 		$result = get_grn_items(0, $supp_trans->supplier_id, true);