X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=frontaccounting.php;h=a7432037aba8eb77f494bd1a9294d13be90a4bb3;hp=3d3347b1aa4f613065745b45ab6dd78ac8431812;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0

diff --git a/frontaccounting.php b/frontaccounting.php
index 3d3347b1..a7432037 100644
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -15,6 +15,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	include_once($path_to_root . '/applications/customers.php');
 	include_once($path_to_root . '/applications/suppliers.php');
 	include_once($path_to_root . '/applications/inventory.php');
+	include_once($path_to_root . '/applications/fixed_assets.php');
 	include_once($path_to_root . '/applications/manufacturing.php');
 	include_once($path_to_root . '/applications/dimensions.php');
 	include_once($path_to_root . '/applications/generalledger.php');
@@ -22,7 +23,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	include_once($path_to_root . '/installed_extensions.php');
 
 	class front_accounting
-		{
+	{
 		var $user;
 		var $settings;
 		var $applications;
@@ -30,20 +31,17 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 
 		var $menu;
 
-		function front_accounting()
-		{
+		function add_application($app)
+		{	
+			if ($app->enabled) // skip inactive modules
+				$this->applications[$app->id] = $app;
 		}
-		function add_application(&$app)
-				{	
-					if ($app->enabled) // skip inactive modules
-						$this->applications[$app->id] = &$app;
-				}
 		function get_application($id)
-				{
-				 if (isset($this->applications[$id]))
-					return $this->applications[$id];
-				 return null;
-				}
+		{
+			 if (isset($this->applications[$id]))
+				return $this->applications[$id];
+			 return null;
+		}
 		function get_selected_application()
 		{
 			if (isset($this->selected_application))
@@ -69,6 +67,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 		}
 		function init()
 		{
+			global $SysPrefs;
 
 			$this->menu = new menu(_("Main  Menu"));
 			$this->menu->add_item(_("Main  Menu"), "index.php");
@@ -77,7 +76,10 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 			$this->add_application(new customers_app());
 			$this->add_application(new suppliers_app());
 			$this->add_application(new inventory_app());
-			$this->add_application(new manufacturing_app());
+			if (get_company_pref('use_manufacturing'))
+				$this->add_application(new manufacturing_app());
+			if (get_company_pref('use_fixed_assets'))
+			    $this->add_application(new assets_app());
 			$this->add_application(new dimensions_app());
 			$this->add_application(new general_ledger_app());
 
@@ -85,4 +87,4 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 
 			$this->add_application(new setup_app());
 		}
-}
+	}