Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

let only triggers part

Browse Source
This commit is contained in:
florian HENRY
2019-09-02 22:01:48 +02:00
parent 405c92640c
commit d811de4da2
6 changed files with 179 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/commonobject.class.php
View File

@@ -1226,9 +1226,6 @@ abstract class CommonObject
// phpcs:enable
global $langs;
if (empty($order)) $order='position';
if ($order == 'position') $order.=',code';
$tab = array();
$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position, tc.element";
$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -1262,11 +1259,11 @@ abstract class CommonObject
{
$obj = $this->db->fetch_object($resql);
$libelle_element = $langs->trans('ContactDefault_'.ucfirst($obj->element));
$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
if (empty($option)) $tab[$obj->rowid]=$libelle_element.' - '.$libelle_type;
else $tab[$obj->code]=$libelle_element.' - '.$libelle_type;
else $tab[$obj->rowid]=$libelle_element.' - '.$libelle_type;
$i++;
}
return $tab;