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

New: Autofill check sender if type is cheque

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-26 02:44:33 +00:00
parent 7988261027
commit 72b607ad1c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/adherents/class/adherent.class.php
View File

@ -49,8 +49,10 @@ class Adherent extends CommonObject
var $id; var $id;
var $ref; var $ref;
var $civilite_id; var $civilite_id;
var $prenom; var $firstname;
var $nom; var $prenom; // deprecated
var $lastname;
var $nom; // deprecated
var $login; var $login;
var $pass; var $pass;
var $societe; var $societe;
@ -924,7 +926,7 @@ class Adherent extends CommonObject
{ {
global $conf, $langs; global $conf, $langs;
$sql = "SELECT d.rowid, d.civilite, d.prenom, d.nom, d.societe, d.fk_soc, d.statut, d.public, d.adresse, d.cp, d.ville, d.note,"; $sql = "SELECT d.rowid, d.civilite, d.prenom as firstname, d.nom as name, d.societe, d.fk_soc, d.statut, d.public, d.adresse, d.cp, d.ville, d.note,";
$sql.= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,"; $sql.= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
$sql.= " d.photo, d.fk_adherent_type, d.morphy,"; $sql.= " d.photo, d.fk_adherent_type, d.morphy,";
$sql.= " d.datec as datec,"; $sql.= " d.datec as datec,";
@ -959,8 +961,10 @@ class Adherent extends CommonObject
$this->ref = $obj->rowid; $this->ref = $obj->rowid;
$this->id = $obj->rowid; $this->id = $obj->rowid;
$this->civilite_id = $obj->civilite; $this->civilite_id = $obj->civilite;
$this->prenom = $obj->prenom; $this->prenom = $obj->firstname;
$this->nom = $obj->nom; $this->firstname = $obj->firstname;
$this->nom = $obj->name;
$this->lastname = $obj->name;
$this->login = $obj->login; $this->login = $obj->login;
$this->pass = $obj->pass; $this->pass = $obj->pass;
$this->societe = $obj->societe; $this->societe = $obj->societe;