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

Fix: Some checkstyle errors

Browse Source
This commit is contained in:
Laurent Destailleur 2012-11-11 18:18:57 +01:00
parent 66755fb166
commit e7164cb243
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/categories/class/categorie.class.php
View File

@ -702,9 +702,9 @@ class Categorie
/** /**
* Retourne toutes les categories * Retourne toutes les categories
* *
* @param int Type of category * @param int $type Type of category
* @param boolean Just parent categories if true * @param boolean $parent Just parent categories if true
* @return array Tableau d'objet Categorie * @return array Tableau d'objet Categorie
*/ */
function get_all_categories($type=null, $parent=false) function get_all_categories($type=null, $parent=false)
{ {
@ -807,7 +807,7 @@ class Categorie
/** /**
* Retourne les categories de premier niveau (qui ne sont pas filles) * Retourne les categories de premier niveau (qui ne sont pas filles)
* *
* @param int Type of category * @param int $type Type of category
* @return void * @return void
*/ */
function get_main_categories($type=null) function get_main_categories($type=null)

4
htdocs/societe/class/societe.class.php
View File

@ -845,6 +845,7 @@ class Societe extends CommonObject
* @param array $filters Array of couple field name/value to filter the companies with the same name * @param array $filters Array of couple field name/value to filter the companies with the same name
* @param boolean $exact Exact string search (true/false) * @param boolean $exact Exact string search (true/false)
* @param boolean $case Case sensitive (true/false) * @param boolean $case Case sensitive (true/false)
* @param boolean $similar Add test if string inside name into database, or name into database inside string. Do not use this: Not compatible with other database.
* @param string $clause Clause for filters * @param string $clause Clause for filters
* @return array Array of thirdparties object * @return array Array of thirdparties object
*/ */
@ -880,7 +881,8 @@ class Societe extends CommonObject
$sql.= "("; $sql.= "(";
if ($similar) if ($similar)
{ {
// For test similitude // For test similitude (string inside name into database, or name into database inside string)
// Do not use this. Not compatible with other database.
$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)"; $sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
} }
else else