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

Doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-29 21:26:42 +00:00
parent bacd81aa3c
commit 74b0053dcc
2 changed files with 26 additions and 19 deletions
Show Stats 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);

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

@ -47,14 +47,17 @@ class Societe extends CommonObject
var $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id; var $id;
var $name; // TODO obsolete
var $nom; var $nom;
var $nom_particulier; var $nom_particulier;
var $prenom; var $prenom;
var $particulier; var $particulier;
var $address; var $address;
var $adresse; // TODO obsolete var $adresse; // TODO obsolete
var $cp; var $cp; // TODO obsolete
var $ville; var $zip;
var $ville; // TODO obsolete
var $town;
var $status; // 0=activity ceased, 1= in activity var $status; // 0=activity ceased, 1= in activity
var $state_id; var $state_id;
@ -64,8 +67,8 @@ class Societe extends CommonObject
var $departement_code; var $departement_code;
var $departement; var $departement;
var $pays_id; var $pays_id; // TODO obsolete
var $pays_code; var $pays_code; // TODO obsolete
var $pays; // TODO obsolete var $pays; // TODO obsolete
var $country_id; var $country_id;
var $country_code; var $country_code;
@ -143,7 +146,8 @@ class Societe extends CommonObject
var $logo_mini; var $logo_mini;
/** /**
* Constructor for class * Constructor
*
* @param DB handler acces base de donnees * @param DB handler acces base de donnees
* @param id id societe (0 par defaut) * @param id id societe (0 par defaut)
*/ */
@ -171,6 +175,7 @@ class Societe extends CommonObject
/** /**
* Create third party in database * Create third party in database
*
* @param user Object of user that ask creation * @param user Object of user that ask creation
* @return int >= 0 if OK, < 0 if KO * @return int >= 0 if OK, < 0 if KO
*/ */
@ -291,6 +296,7 @@ class Societe extends CommonObject
/** /**
* Check properties of third party are ok (like name, third party codes, ...) * Check properties of third party are ok (like name, third party codes, ...)
*
* @return int 0 if OK, <0 if KO * @return int 0 if OK, <0 if KO
*/ */
function verify() function verify()
@ -366,6 +372,7 @@ class Societe extends CommonObject
/** /**
* Update parameters of third party * Update parameters of third party
*
* @param id id societe * @param id id societe
* @param user Utilisateur qui demande la mise a jour * @param user Utilisateur qui demande la mise a jour
* @param call_trigger 0=non, 1=oui * @param call_trigger 0=non, 1=oui
@ -404,6 +411,7 @@ class Societe extends CommonObject
$this->ville=$this->town; // TODO obsolete $this->ville=$this->town; // TODO obsolete
$this->state_id=trim($this->state_id); $this->state_id=trim($this->state_id);
$this->pays_id=trim($this->pays_id); $this->pays_id=trim($this->pays_id);
$this->country_id=trim($this->country_id);
$this->tel=trim($this->tel); $this->tel=trim($this->tel);
$this->fax=trim($this->fax); $this->fax=trim($this->fax);
$this->tel = preg_replace("/\s/","",$this->tel); $this->tel = preg_replace("/\s/","",$this->tel);