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

Merge pull request #9842 from fappels/8.0

Browse Source 
Deprecate class property expeditionbatch before removing it.
This commit is contained in:
Laurent Destailleur 2018-10-24 02:25:02 +02:00 committed by GitHub
commit 6c3e1f6d26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ class ExpeditionLineBatch extends CommonObject
var $eatby; var $eatby;
var $batch; var $batch;
var $qty; var $qty;
var $dluo_qty; // deprecated, use qty
var $entrepot_id; var $entrepot_id;
var $fk_origin_stock; var $fk_origin_stock;
var $fk_expeditiondet; var $fk_expeditiondet;
@ -118,7 +119,7 @@ class ExpeditionLineBatch extends CommonObject
$sql.= " ".(! isset($this->sellby) || dol_strlen($this->sellby)==0?'NULL':("'".$this->db->idate($this->sellby))."'").","; $sql.= " ".(! isset($this->sellby) || dol_strlen($this->sellby)==0?'NULL':("'".$this->db->idate($this->sellby))."'").",";
$sql.= " ".(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':("'".$this->db->idate($this->eatby))."'").","; $sql.= " ".(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':("'".$this->db->idate($this->eatby))."'").",";
$sql.= " ".(! isset($this->batch)?'NULL':("'".$this->db->escape($this->batch)."'")).","; $sql.= " ".(! isset($this->batch)?'NULL':("'".$this->db->escape($this->batch)."'")).",";
$sql.= " ".(! isset($this->qty)?'NULL':$this->qty).","; $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_origin_stock)?'NULL':$this->fk_origin_stock);
$sql.= ")"; $sql.= ")";
@ -218,6 +219,7 @@ class ExpeditionLineBatch extends CommonObject
$tmp->id = $obj->rowid; $tmp->id = $obj->rowid;
$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; // dluo_qty deprecated, use qty
$tmp->qty = $obj->qty; $tmp->qty = $obj->qty;
$ret[]=$tmp; $ret[]=$tmp;