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

Doxygen

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-29 21:26:42 +00:00
parent 05e6bf3a32
commit b3f55e03bf
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/lib/functions.lib.php
View File

@@ -3898,19 +3898,18 @@ function dol_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
} }
/** /**
* Advanced sort array by second index function, which produces * Advanced sort array by second index function, which produces ascending (default)
* ascending (default) or descending output and uses optionally * or descending output and uses optionally natural case insensitive sorting (which
* natural case insensitive sorting (which can be optionally case * can be optionally case sensitive as well).
* sensitive as well).
* *
* @param array Array to sort * @param array $array Array to sort
* @param index * @param string $index Key in array to use for sorting criteria
* @param order * @param int $order Sort order
* @param natsort * @param int $natsort 1=use "natural" sort (natsort), 0=use "standard sort (asort)
* @param case_sensitive Sort is case sensitive * @param int $case_sensitive 1=sort is case sensitive, 0=not case sensitive
* @return Sorted array * @return array Sorted array
*/ */
function dol_sort_array(&$array, $index, $order='asc', $natsort, $case_sensitive) function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensitive=0)
{ {
// Clean parameters // Clean parameters
$order=strtolower($order); $order=strtolower($order);

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

@@ -477,7 +477,7 @@ class Societe extends CommonObject
$sql.= ",ville = ".($this->town?"'".$this->db->escape($this->town)."'":"null"); $sql.= ",ville = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
$sql .= ",fk_departement = '" . ($this->state_id?$this->state_id:'0') ."'"; $sql .= ",fk_departement = '" . ($this->state_id?$this->state_id:'0') ."'";
$sql .= ",fk_pays = '" . ($this->country_id?$this->country_id:'0') ."'"; $sql .= ",fk_pays = '" . ($this->pays_id?$this->pays_id:'0') ."'";
$sql .= ",tel = ".($this->tel?"'".$this->db->escape($this->tel)."'":"null"); $sql .= ",tel = ".($this->tel?"'".$this->db->escape($this->tel)."'":"null");
$sql .= ",fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null"); $sql .= ",fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null");