From 231fd6b2ae44b718286d30705c93f0b319d95b6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Apr 2012 12:37:53 +0200
Subject: [PATCH] Fix: Removed warning

---
 htdocs/core/class/conf.class.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 8b220b58800..bd0f026aab7 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -94,7 +94,7 @@ class Conf
 		$this->syslog			= (object) array();
 		$this->browser			= (object) array();
 		$this->multicompany		= (object) array();
-		
+
 		// First level object
 		$this->expedition_bon	= (object) array();
 		$this->livraison_bon	= (object) array();
@@ -111,7 +111,7 @@ class Conf
 		$this->bank				= (object) array();
 		$this->notification		= (object) array();
 		$this->mailing			= (object) array();
-		
+
 		//! Charset for HTML output and for storing data in memory
 		$this->file->character_set_client='UTF-8';   // UTF-8, ISO-8859-1
 	}
@@ -207,12 +207,12 @@ class Conf
 				}
 				$i++;
 			}
-			
+
 		    $db->free($resql);
 		}
 		//var_dump($this->modules);
 		//var_dump($this->modules_parts);
-		
+
 		// Object $mc
 		if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled))
 		{
@@ -220,7 +220,7 @@ class Conf
 			$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
 			if ($ret) $mc = new ActionsMulticompany($db);
 		}
-		
+
 		// Second or others levels object
 		$this->propal->cloture				= (object) array();
 		$this->propal->facturation			= (object) array();
@@ -289,7 +289,7 @@ class Conf
 		// For backward compatibility
 		$this->user->dir_output=$rootforuser."/users";
 		$this->user->dir_temp=$rootforuser."/users/temp";
-		
+
 		// For propal storage
 		$this->propal->dir_output=$rootforuser."/propale";
 		$this->propal->dir_temp=$rootforuser."/propale/temp";
@@ -307,7 +307,7 @@ class Conf
 		$this->fournisseur->commande->dir_temp  =$rootfordata."/fournisseur/commande/temp";
 		$this->fournisseur->facture->dir_output =$rootfordata."/fournisseur/facture";
 		$this->fournisseur->facture->dir_temp   =$rootfordata."/fournisseur/facture/temp";
-		
+
 		// Module product/service
 		$this->product->multidir_output=array($this->entity => $rootfordata."/produit");
 		$this->product->multidir_temp  =array($this->entity => $rootfordata."/produit/temp");
@@ -318,7 +318,7 @@ class Conf
 		$this->product->dir_temp  =$rootfordata."/produit/temp";
 		$this->service->dir_output=$rootfordata."/produit";
 		$this->service->dir_temp  =$rootfordata."/produit/temp";
-		
+
 		// Module contrat
 		$this->contrat->dir_output=$rootfordata."/contracts";
 		$this->contrat->dir_temp  =$rootfordata."/contracts/temp";
@@ -414,11 +414,11 @@ class Conf
 		$this->bank->cheque->warning_delay=(isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT)?$this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT:0)*24*60*60;
 
 		// For backward compatibility
-		$this->produit=$this->product;
-		$this->invoice=$this->facture;
-		$this->order=$this->commande;
-		$this->contract=$this->contrat;
-		$this->category=$this->categorie;
+		if (isset($this->product))   $this->produit=$this->product;
+		if (isset($this->facture))   $this->invoice=$this->facture;
+		if (isset($this->commande))  $this->order=$this->commande;
+		if (isset($this->contrat))   $this->contract=$this->contrat;
+		if (isset($this->categorie)) $this->category=$this->categorie;
 
 
         // Define menu manager in setup
@@ -435,7 +435,7 @@ class Conf
         // For backward compatibility
         if ($this->top_menu == 'eldy.php') $this->top_menu='eldy_backoffice.php';
         elseif ($this->top_menu == 'rodolphe.php') $this->top_menu='eldy_backoffice.php';
-        
+
         // Object $mc
         if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled))
         {