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

New: early development of multi-company module

Browse Source
This commit is contained in:
Regis Houssin 2009-04-30 16:44:31 +00:00
parent 6a9a9ff040
commit 974a10e1cc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/expedition/index.php
View File

@ -68,7 +68,8 @@ if (!$user->rights->societe->client->voir && !$socid)
$clause = " AND "; $clause = " AND ";
} }
$sql.= $clause." e.fk_statut = 0"; $sql.= $clause." e.fk_statut = 0";
$sql.= " AND e.entity = ".$conf->entity; $sql.= " AND (e.entity = ".$conf->entity;
$sql.= " AND s.entity = ".$conf->entity.")";
if ($socid) $sql.= " AND c.fk_soc = ".$socid; if ($socid) $sql.= " AND c.fk_soc = ".$socid;
$resql=$db->query($sql); $resql=$db->query($sql);

6
htdocs/livraison/livraison.class.php
View File

@ -87,7 +87,6 @@ class Livraison extends CommonObject
$this->brouillon = 1; $this->brouillon = 1;
$this->user = $user; $this->user = $user;
if ($this->expedition_id) $expedition_id
$this->db->begin(); $this->db->begin();
@ -116,9 +115,10 @@ class Livraison extends CommonObject
{ {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."livraison"); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."livraison");
$numref="(PROV".$this->id.")"; $numref = "(PROV".$this->id.")";
$sql = "UPDATE ".MAIN_DB_PREFIX."livraison "; $sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
$sql.= "SET ref = '".addslashes($numref); $sql.= "SET ref = '".addslashes($numref)."'";
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG); dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);