Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Removed warning

Browse Source
This commit is contained in:
Laurent Destailleur
2012-04-10 12:37:53 +02:00
parent 6616254504
commit 231fd6b2ae
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/core/class/conf.class.php
View File

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