Browse files

Fix: Removed warning

  • Loading branch information...
1 parent d7e579e commit 307c010b907aff692b1373f3b80220bbb540f4bc @eldy eldy committed with Regis Houssin Apr 10, 2012
Showing with 14 additions and 14 deletions.
  1. +14 −14 htdocs/core/class/conf.class.php
View
28 htdocs/core/class/conf.class.php
@@ -94,7 +94,7 @@ function 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 @@ function 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,20 +207,20 @@ function setValues($db)
}
$i++;
}
-
+
$db->free($resql);
}
//var_dump($this->modules);
//var_dump($this->modules_parts);
-
+
// Object $mc
if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled))
{
global $mc;
$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 @@ function setValues($db)
// 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 @@ function setValues($db)
$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 @@ function setValues($db)
$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 @@ function setValues($db)
$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 @@ function setValues($db)
// 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))
{

0 comments on commit 307c010

Please sign in to comment.