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

Revert "Add entrepot id to expedition batch fetchAll"

Browse Source 
This reverts commit 5342785a49.
This commit is contained in:
fappels 2017-10-24 15:45:49 +02:00
parent 914b8c1c71
commit eaf3958be7
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/expedition/class/expeditionbatch.class.php
View File

@ -177,18 +177,15 @@ class ExpeditionLineBatch extends CommonObject
*/ */
static function fetchAll($db,$id_line_expdet) static function fetchAll($db,$id_line_expdet)
{ {
$sql="SELECT t.rowid"; $sql="SELECT rowid,";
$sql.= ", t.fk_expeditiondet"; $sql.= "fk_expeditiondet";
$sql.= ", t.sellby"; $sql.= ", sellby";
$sql.= ", t.eatby"; $sql.= ", eatby";
$sql.= ", t.batch"; $sql.= ", batch";
$sql.= ", t.qty"; $sql.= ", qty";
$sql.= ", t.fk_origin_stock"; $sql.= ", fk_origin_stock";
$sql.= ", ps.fk_entrepot"; $sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element;
$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." t"; $sql.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch pb ON t.fk_origin_stock = pb.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock ps ON pb.fk_product_stock = ps.rowid";
$sql.= " WHERE t.fk_expeditiondet=".(int) $id_line_expdet;
dol_syslog(__METHOD__ ."", LOG_DEBUG); dol_syslog(__METHOD__ ."", LOG_DEBUG);
$resql=$db->query($sql); $resql=$db->query($sql);
@ -210,7 +207,6 @@ class ExpeditionLineBatch extends CommonObject
$tmp->fk_origin_stock = $obj->fk_origin_stock; $tmp->fk_origin_stock = $obj->fk_origin_stock;
$tmp->fk_expeditiondet = $obj->fk_expeditiondet; $tmp->fk_expeditiondet = $obj->fk_expeditiondet;
$tmp->dluo_qty = $obj->qty; $tmp->dluo_qty = $obj->qty;
$tmp->entrepot_id = $obj->fk_entrepot;
$ret[]=$tmp; $ret[]=$tmp;
$i++; $i++;