*** empty log message ***

This commit is contained in:
Regis Houssin 2007-05-04 13:37:37 +00:00
parent 45b687cac2
commit 49988a277c
2 changed files with 37 additions and 39 deletions

View File

@ -361,11 +361,10 @@ class CommonObject
* \param id id du contact * \param id id du contact
* \return array détail du contact * \return array détail du contact
*/ */
function fetch_user($id) function fetch_user($userid)
{ {
$iduser = $id; $user = new User($this->db, $userid);
$user = new User($this->db, $iduser); $user->fetch();
$user->fetch();
$this->user = $user; $this->user = $user;
} }

View File

@ -45,50 +45,49 @@ require_once(DOL_DOCUMENT_ROOT ."/contact.class.php");
class Propal extends CommonObject class Propal extends CommonObject
{ {
var $db; var $db;
var $element='propal'; var $element='propal';
var $id; var $id;
var $socid; // Id client var $socid; // Id client
var $client; // Objet societe client (à charger par fetch_client) var $client; // Objet societe client (à charger par fetch_client)
var $contactid; var $contactid;
var $projetidp; var $projetidp;
var $author; var $author;
var $ref; var $ref;
var $ref_client; var $ref_client;
var $statut; // 0, 1, 2, 3, 4 var $statut; // 0, 1, 2, 3, 4
var $datep; var $datep;
var $fin_validite; var $fin_validite;
var $price; // Total HT var $price; // Total HT
var $tva; // Total TVA var $tva; // Total TVA
var $total; // Total TTC var $total; // Total TTC
var $cond_reglement_id; var $cond_reglement_id;
var $cond_reglement_code; var $cond_reglement_code;
var $mode_reglement_id; var $mode_reglement_id;
var $mode_reglement_code; var $mode_reglement_code;
var $remise; var $remise;
var $remise_percent; var $remise_percent;
var $remise_absolue; var $remise_absolue;
var $note; var $note;
var $note_public; var $note_public;
var $date_livraison; var $date_livraison;
var $adresse_livraison_id; var $adresse_livraison_id;
var $adresse; var $adresse;
var $products=array(); var $products=array();
var $labelstatut=array(); var $labelstatut=array();
var $labelstatut_short=array(); var $labelstatut_short=array();
// Pour board
var $nbtodo;
var $nbtodolate;
// Pour board var $specimen;
var $nbtodo; var $error;
var $nbtodolate;
var $specimen;
var $error;
/** /**