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

Merge pull request #1871 from KreizIT/3.6

Browse Source 
Little fix
This commit is contained in:
Laurent Destailleur 2014-09-11 17:15:29 +02:00
commit dddafacad9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/class/expedition.class.php
View File

@ -919,6 +919,7 @@ class Expedition extends CommonObject
$this->db->begin();
if ($conf->productbatch->enabled) {
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
if ( ExpeditionLigneBatch::deletefromexp($this->db,$this->id)<0)
{$error++;$this->errors[]="Error ".$this->db->lasterror();}
}
@ -1096,6 +1097,7 @@ class Expedition extends CommonObject
$line = new ExpeditionLigne($this->db);
$obj = $this->db->fetch_object($resql);
$line->line_id = $obj->line_id;
$line->fk_origin_line = $obj->fk_origin_line;
$line->origin_line_id = $obj->fk_origin_line; // TODO deprecated
$line->entrepot_id = $obj->fk_entrepot;