lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6196 from aspangaro/5.0-b12

Browse Source 
Fix: Travis
This commit is contained in:
Laurent Destailleur 2016-12-23 00:44:16 +01:00 committed by GitHub
commit 594ecf400b
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/adherents/class/subscription.class.php
View File

@ -293,7 +293,6 @@ class Subscription extends CommonObject
* Renvoi le libelle d'un statut donne * Renvoi le libelle d'un statut donne
* *
* @param int $statut Id statut * @param int $statut Id statut
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Label * @return string Label
*/ */
function LibStatut($statut) function LibStatut($statut)

32
htdocs/core/modules/import/modules_import.php
View File

@ -44,12 +44,12 @@ class ModeleImports
public $version_lib; // Version of external lib used by driver public $version_lib; // Version of external lib used by driver
// Array of all drivers // Array of all drivers
public $_driverlabel=array(); public $driverlabel=array();
public $_driverdesc=array(); public $driverdesc=array();
public $_driverversion=array(); public $driverversion=array();
public $_liblabel=array(); public $liblabel=array();
public $_libversion=array(); public $libversion=array();
/** /**
@ -166,19 +166,19 @@ class ModeleImports
// Picto // Picto
$this->picto[$module->id]=$module->picto; $this->picto[$module->id]=$module->picto;
// Driver properties // Driver properties
$this->_driverlabel[$module->id]=$module->getDriverLabel(''); $this->driverlabel[$module->id]=$module->getDriverLabel('');
$this->_driverdesc[$module->id]=$module->getDriverDesc(''); $this->driverdesc[$module->id]=$module->getDriverDesc('');
$this->_driverversion[$module->id]=$module->getDriverVersion(''); $this->driverversion[$module->id]=$module->getDriverVersion('');
// If use an external lib // If use an external lib
$this->_liblabel[$module->id]=$module->getLibLabel(''); $this->liblabel[$module->id]=$module->getLibLabel('');
$this->_libversion[$module->id]=$module->getLibVersion(''); $this->libversion[$module->id]=$module->getLibVersion('');
$i++; $i++;
} }
} }
} }
return array_keys($this->_driverlabel); return array_keys($this->driverlabel);
} }
@ -201,7 +201,7 @@ class ModeleImports
*/ */
function getDriverLabelForKey($key) function getDriverLabelForKey($key)
{ {
return $this->_driverlabel[$key]; return $this->driverlabel[$key];
} }
/** /**
@ -212,7 +212,7 @@ class ModeleImports
*/ */
function getDriverDescForKey($key) function getDriverDescForKey($key)
{ {
return $this->_driverdesc[$key]; return $this->driverdesc[$key];
} }
/** /**
@ -223,7 +223,7 @@ class ModeleImports
*/ */
function getDriverVersionForKey($key) function getDriverVersionForKey($key)
{ {
return $this->_driverversion[$key]; return $this->driverversion[$key];
} }
/** /**
@ -234,7 +234,7 @@ class ModeleImports
*/ */
function getLibLabelForKey($key) function getLibLabelForKey($key)
{ {
return $this->_liblabel[$key]; return $this->liblabel[$key];
} }
/** /**
@ -245,7 +245,7 @@ class ModeleImports
*/ */
function getLibVersionForKey($key) function getLibVersionForKey($key)
{ {
return $this->_libversion[$key]; return $this->libversion[$key];
} }
} }