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

Fix eol

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-02 14:25:52 +02:00
parent c3438b79c8
commit 32a03f3c0b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,14 +48,14 @@ class Expedition extends CommonObject
* @var string ID to identify managed object
*/
public $element="shipping";
public $fk_element="fk_expedition";
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element="expedition";
public $table_element_line="expeditiondet";
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'sending';
@ -478,7 +478,7 @@ class Expedition extends CommonObject
$sql.= ", e.note_private, e.note_public";
$sql.= ', e.fk_incoterms, e.location_incoterms';
$sql.= ', i.libelle as libelle_incoterms';
$sql.= ', s.libelle as shipping_method';
$sql.= ', s.libelle as shipping_method';
$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
@ -2293,7 +2293,7 @@ class ExpeditionLigne extends CommonObjectLine
* @var string ID to identify managed object
*/
public $element='expeditiondet';
/**
* @var string Name of table without prefix where object is stored
*/