Qual: Remove checkstyle warnings

This commit is contained in:
Laurent Destailleur
2012-01-04 21:23:50 +01:00
parent 69c4cbd872
commit 3f8d2cbef8
60 changed files with 972 additions and 795 deletions

View File

@@ -41,14 +41,14 @@ class modPropale extends DolibarrModules
/**
* Constructor. Define names, constants, directories, boxes, permissions
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function modPropale($DB)
function modPropale($db)
{
global $conf;
$this->db = $DB ;
$this->numero = 20 ;
$this->db = $db;
$this->numero = 20;
$this->family = "crm";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
@@ -95,7 +95,7 @@ class modPropale extends DolibarrModules
$this->const[$r][3] = 'Duration of validity of business proposals';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PROPALE_ADDON_PDF_ODT_PATH";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/proposals";
@@ -181,16 +181,20 @@ class modPropale extends DolibarrModules
/**
* \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
* Definit egalement les repertoires de donnees a creer pour ce module.
* Function called when module is enabled.
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
* It also creates data directories
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function init()
function init($options='')
{
global $conf;
// Remove permissions and default values
$this->remove();
//ODT template
require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$dirodt=DOL_DATA_ROOT.'/doctemplates/proposals';
@@ -202,7 +206,7 @@ class modPropale extends DolibarrModules
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','propal',".$conf->entity.")",
);
return $this->_init($sql);
return $this->_init($sql,$options);
}