Cleanup (fixed installed_extensions indlusion).

diff --git a/includes/session.inc b/includes/session.inc
index ae77e1ba8df920d6db5cf3b99b325966e1d043e6..ea0d1d2bb7db15381d43d2bd95d4967f8e6c445a 100644 (file)
--- 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 24396f2770107cea8b25b1595881fd4ae5a093d1..67a02e668b110fb7a1db73a2019e86d8fed820db 100644 (file)
--- 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);