Skip to content
Snippets Groups Projects
Commit 61edda61 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix remove some warnings

parent 4b4de22a
No related branches found
No related tags found
No related merge requests found
...@@ -768,9 +768,10 @@ abstract class CommonObject ...@@ -768,9 +768,10 @@ abstract class CommonObject
* @param int $statut Status of links to get (-1=all) * @param int $statut Status of links to get (-1=all)
* @param string $source Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user) * @param string $source Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
* @param int $list 0:Return array contains all properties, 1:Return array contains just id * @param int $list 0:Return array contains all properties, 1:Return array contains just id
* @param string $code Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
* @return array Array of contacts * @return array Array of contacts
*/ */
function liste_contact($statut=-1,$source='external',$list=0) function liste_contact($statut=-1,$source='external',$list=0,$code='')
{ {
global $langs; global $langs;
...@@ -788,6 +789,7 @@ abstract class CommonObject ...@@ -788,6 +789,7 @@ abstract class CommonObject
$sql.= " WHERE ec.element_id =".$this->id; $sql.= " WHERE ec.element_id =".$this->id;
$sql.= " AND ec.fk_c_type_contact=tc.rowid"; $sql.= " AND ec.fk_c_type_contact=tc.rowid";
$sql.= " AND tc.element='".$this->element."'"; $sql.= " AND tc.element='".$this->element."'";
if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
if ($source == 'internal') $sql.= " AND tc.source = 'internal'"; if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'"; if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
$sql.= " AND tc.active=1"; $sql.= " AND tc.active=1";
...@@ -825,7 +827,7 @@ abstract class CommonObject ...@@ -825,7 +827,7 @@ abstract class CommonObject
} }
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->lasterror();
dol_print_error($this->db); dol_print_error($this->db);
return -1; return -1;
} }
......
...@@ -1922,6 +1922,8 @@ function pdf_getLinkedObjects($object,$outputlangs) ...@@ -1922,6 +1922,8 @@ function pdf_getLinkedObjects($object,$outputlangs)
{ {
$elementobject->fetchObjectLinked(); $elementobject->fetchObjectLinked();
if (count($elementobject->linkedObjects) > 0)
{
$order = reset($elementobject->linkedObjects['commande']); // Get first order $order = reset($elementobject->linkedObjects['commande']); // Get first order
if (! empty($object->linkedObjects['commande'])) // There is already a link to order so we show only info of shipment if (! empty($object->linkedObjects['commande'])) // There is already a link to order so we show only info of shipment
...@@ -1943,6 +1945,7 @@ function pdf_getLinkedObjects($object,$outputlangs) ...@@ -1943,6 +1945,7 @@ function pdf_getLinkedObjects($object,$outputlangs)
} }
} }
} }
}
// For add external linked objects // For add external linked objects
if (is_object($hookmanager)) if (is_object($hookmanager))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment