Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove TODO

Browse Source
This commit is contained in:
Laurent Destailleur 2023-09-13 10:46:18 +02:00
parent 0c3e516e57
commit 60a52d0bc6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/expedition/class/expeditionlinebatch.class.php
View File

@ -44,8 +44,8 @@ class ExpeditionLineBatch extends CommonObject
public $qty;
public $dluo_qty; // deprecated, use qty
public $entrepot_id;
public $fk_origin_stock; // rowid in llx_product_batch table
public $fk_warehouse; // for future use in v19
public $fk_origin_stock; // rowid in llx_product_batch table (not usefull)
public $fk_warehouse; // warehouse ID
public $fk_expeditiondet;
@ -63,7 +63,7 @@ class ExpeditionLineBatch extends CommonObject
* Fill object based on a product-warehouse-batch's record
*
* @param int $id_stockdluo Rowid in product_batch table
* @return int -1 if KO, 1 if OK
* @return int -1 if KO, 1 if OK
*/
public function fetchFromStock($id_stockdluo)
{
@ -72,7 +72,6 @@ class ExpeditionLineBatch extends CommonObject
$sql .= " pl.sellby,";
$sql .= " pl.eatby,";
$sql .= " ps.fk_entrepot";
$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
$sql .= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid";
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
@ -124,7 +123,7 @@ class ExpeditionLineBatch extends CommonObject
$sql .= ", batch";
$sql .= ", qty";
$sql .= ", fk_origin_stock";
// TODO Add fk_warehouse here
$sql .= ", fk_warehouse";
$sql .= ") VALUES (";
$sql .= $id_line_expdet.",";
$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : ("'".$this->db->idate($this->sellby))."'").",";
@ -132,6 +131,7 @@ class ExpeditionLineBatch extends CommonObject
$sql .= " ".(!isset($this->batch) ? 'NULL' : ("'".$this->db->escape($this->batch)."'")).",";
$sql .= " ".(!isset($this->qty) ? ((!isset($this->dluo_qty)) ? 'NULL' : $this->dluo_qty) : $this->qty).","; // dluo_qty deprecated, use qty
$sql .= " ".(!isset($this->fk_origin_stock) ? 'NULL' : $this->fk_origin_stock);
$sql .= " ".(!isset($this->fk_warehouse) ? 'NULL' : $this->fk_warehouse);
$sql .= ")";
dol_syslog(__METHOD__, LOG_DEBUG);
@ -201,7 +201,8 @@ class ExpeditionLineBatch extends CommonObject
$sql .= " eb.eatby as oldeatby,"; // deprecated
$sql .= " eb.batch,";
$sql .= " eb.qty,";
$sql .= " eb.fk_origin_stock";
$sql .= " eb.fk_origin_stock,";
$sql .= " eb.fk_warehouse";
if ($fk_product > 0) {
$sql .= ", pl.sellby";
$sql .= ", pl.eatby";
@ -228,6 +229,7 @@ class ExpeditionLineBatch extends CommonObject
$tmp->id = $obj->rowid;
$tmp->fk_origin_stock = $obj->fk_origin_stock;
$tmp->fk_expeditiondet = $obj->fk_expeditiondet;
$tmp->fk_warehouse = $obj->fk_warehouse;
$tmp->dluo_qty = $obj->qty; // dluo_qty deprecated, use qty
$tmp->qty = $obj->qty;