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

Fix: Uniformisation du nom du champ id societe. On prend partout "socid".

Browse Source
This commit is contained in:
Laurent Destailleur
2006-09-13 18:56:30 +00:00
parent 27e6cb8ab7
commit f9d90c3908
222 changed files with 1370 additions and 1373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/commande/commande.class.php
View File

@@ -45,7 +45,7 @@ class Commande extends CommonObject
var $id ;
var $socidp; // Id client
var $socid; // Id client
var $client; // Objet societe client (<28> charger par fetch_client)
var $ref;
@@ -77,12 +77,12 @@ class Commande extends CommonObject
* \brief Constructeur
* \param DB Handler d'acc<63>s base
*/
function Commande($DB, $socidp="", $commandeid=0)
function Commande($DB, $socid="", $commandeid=0)
{
global $langs;
$langs->load('orders');
$this->db = $DB;
$this->socidp = $socidp;
$this->socid = $socid;
$this->id = $commandeid;
$this->sources[0] = $langs->trans('OrderSource0');
@@ -126,7 +126,7 @@ class Commande extends CommonObject
$this->lines[$i] = $CommLigne;
}
$this->socidp = $propal->socidp;
$this->socid = $propal->socid;
$this->projetid = $propal->projetidp;
$this->cond_reglement_id = $propal->cond_reglement_id;
$this->mode_reglement_id = $propal->mode_reglement_id;
@@ -137,7 +137,7 @@ class Commande extends CommonObject
/* D<>finit la soci<63>t<EFBFBD> comme un client */
$soc = new Societe($this->db);
$soc->id = $this->socidp;
$soc->id = $this->socid;
$soc->set_as_client();
$this->propale_id = $propal->id;
@@ -174,7 +174,7 @@ class Commande extends CommonObject
// Recuperation de la nouvelle reference
$objMod = new $modName($this->db);
$soc = new Societe($this->db);
$soc->fetch($this->socidp);
$soc->fetch($this->socid);
// Classe la soci<63>t<EFBFBD> rattach<63>e comme client
$result=$soc->set_as_client();
@@ -373,7 +373,7 @@ class Commande extends CommonObject
if (! $this->projetid) $this->projetid = 0;
$soc = new Societe($this->db);
$result=$soc->fetch($this->socidp);
$result=$soc->fetch($this->socid);
if ($result < 0)
{
$this->error="Failed to fetch company";
@@ -387,7 +387,7 @@ class Commande extends CommonObject
$sql.= 'fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_public, ref_client,';
$sql.= ' model_pdf, fk_cond_reglement, fk_mode_reglement, date_livraison, fk_adresse_livraison,';
$sql.= ' remise_absolue, remise_percent)';
$sql.= ' VALUES ('.$this->socidp.', now(), '.$user->id.', '.$this->projetid.',';
$sql.= ' VALUES ('.$this->socid.', now(), '.$user->id.', '.$this->projetid.',';
$sql.= ' '.$this->db->idate($this->date_commande).',';
$sql.= ' '.$this->source.', ';
$sql.= " '".addslashes($this->note)."', ";
@@ -440,7 +440,7 @@ class Commande extends CommonObject
$this->db->query($sql);
// On r<>cup<75>re les diff<66>rents contact interne et externe
$prop = New Propal($this->db, $this->socidp, $this->propale_id);
$prop = New Propal($this->db, $this->socid, $this->propale_id);
// On r<>cup<75>re le commercial suivi propale
$this->userid = $prop->getIdcontact('internal', 'SALESREPFOLL');
@@ -795,7 +795,7 @@ class Commande extends CommonObject
$this->id = $obj->rowid;
$this->ref = $obj->ref;
$this->ref_client = $obj->ref_client;
$this->socidp = $obj->fk_soc;
$this->socid = $obj->fk_soc;
$this->statut = $obj->fk_statut;
$this->user_author_id = $obj->fk_user_author;
$this->total_ht = $obj->total_ht;
@@ -2012,7 +2012,7 @@ class Commande extends CommonObject
$this->ref = 'SPECIMEN';
$this->specimen=1;
$socid = rand(1, $num_socs);
$this->socidp = $socids[$socid];
$this->socid = $socids[$socid];
$this->date = time();
$this->date_lim_reglement=$this->date+3600*24*30;
$this->cond_reglement_code = 'RECEP';