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

Fix: Bug #460 - Wrong entity assignment when creating a warehouse

Browse Source
This commit is contained in:
Regis Houssin 2012-07-26 20:48:35 +02:00
parent 501dccabc2
commit 6bcf2be91b
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/product/class/product.class.php
View File

@ -2330,11 +2330,16 @@ class Product extends CommonObject
*/ */
function load_stock() function load_stock()
{ {
global $conf;
$this->stock_reel = 0; $this->stock_reel = 0;
$sql = "SELECT reel, fk_entrepot, pmp"; $sql = "SELECT ps.reel, ps.fk_entrepot, ps.pmp";
$sql.= " FROM ".MAIN_DB_PREFIX."product_stock"; $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
$sql.= " WHERE fk_product = '".$this->id."'"; $sql.= ", ".MAIN_DB_PREFIX."entrepot as w";
$sql.= " WHERE w.entity = ".$conf->entity;
$sql.= " AND w.rowid = ps.fk_entrepot";
$sql.= " AND ps.fk_product = ".$this->id;
dol_syslog("Product::load_stock sql=".$sql); dol_syslog("Product::load_stock sql=".$sql);
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;

6
htdocs/product/stock/class/entrepot.class.php
View File

@ -70,6 +70,8 @@ class Entrepot extends CommonObject
*/ */
function create($user) function create($user)
{ {
global $conf;
// Si libelle non defini, erreur // Si libelle non defini, erreur
if ($this->libelle == '') if ($this->libelle == '')
{ {
@ -79,8 +81,8 @@ class Entrepot extends CommonObject
$this->db->begin(); $this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (datec, fk_user_author, label)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (entity, datec, fk_user_author, label)";
$sql .= " VALUES (".$this->db->idate(mktime()).",".$user->id.",'".$this->db->escape($this->libelle)."')"; $sql .= " VALUES (".$conf->entity.",'".$this->db->idate(mktime())."',".$user->id.",'".$this->db->escape($this->libelle)."')";
dol_syslog("Entrepot::create sql=".$sql); dol_syslog("Entrepot::create sql=".$sql);
$result=$this->db->query($sql); $result=$this->db->query($sql);

1
htdocs/product/stock/product.php
View File

@ -209,6 +209,7 @@ if ($_GET["id"] || $_GET["ref"])
print '</tr>'; print '</tr>';
// Real stock // Real stock
$product->load_stock();
print '<tr><td>'.$langs->trans("PhysicalStock").'</td>'; print '<tr><td>'.$langs->trans("PhysicalStock").'</td>';
print '<td>'.$product->stock_reel; print '<td>'.$product->stock_reel;
if ($product->seuil_stock_alerte && ($product->stock_reel < $product->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockTooLow")); if ($product->seuil_stock_alerte && ($product->stock_reel < $product->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockTooLow"));