forked from Wavyzz/dolibarr
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
@@ -2265,6 +2265,7 @@ class Commande extends CommonOrder
|
|||||||
$sql .= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
|
||||||
$sql .= ', '.MAIN_DB_PREFIX.'element_element as el';
|
$sql .= ', '.MAIN_DB_PREFIX.'element_element as el';
|
||||||
$sql .= ' WHERE el.fk_source = '.$this->id;
|
$sql .= ' WHERE el.fk_source = '.$this->id;
|
||||||
|
$sql .= " AND el.sourcetype = 'commande'";
|
||||||
$sql .= " AND el.fk_target = e.rowid";
|
$sql .= " AND el.fk_target = e.rowid";
|
||||||
$sql .= " AND el.targettype = 'shipping'";
|
$sql .= " AND el.targettype = 'shipping'";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user