diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 6762770d564..f69040b5f16 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1624,6 +1624,8 @@ class Categorie extends CommonObject { global $langs; + $langs->load('categories'); + $datas = []; $datas['label'] = $langs->trans("ShowCategory").': '.($this->ref ? $this->ref : $this->label); @@ -1656,7 +1658,6 @@ class Categorie extends CommonObject if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) { $classfortooltip = 'classforajaxtooltip'; $dataparams = ' data-params='.json_encode($params); - // $label = $langs->trans('Loading'); } $label = implode($this->getTooltipContentArray($params)); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 204fe9faf19..f8074ffcd46 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -11244,11 +11244,21 @@ function getElementProperties($element_type) $classpath = 'comm/action/class'; $subelement = 'Actioncomm'; $module = 'agenda'; + } elseif ($element_type == 'adherent_type') { + $classpath = 'adherents/class'; + $classfile = 'adherent_type'; + $module = 'adherent'; + $subelement = 'adherent_type'; + $classname = 'AdherentType'; } elseif ($element_type == 'bank_account') { $classpath = 'compta/bank/class'; $module = 'banque'; $classfile = 'Account'; $classname = 'Account'; + } elseif ($element_type == 'category') { + $classpath = 'categories/class'; + $module = 'categorie'; + $subelement = 'categorie'; } elseif ($element_type == 'stock') { $classpath = 'product/stock/class'; $classfile = 'entrepot'; @@ -11272,6 +11282,10 @@ function getElementProperties($element_type) $classpath = 'comm/propal/class'; } elseif ($element_type == 'supplier_proposal') { $classpath = 'supplier_proposal/class'; + $module = 'supplier_proposal'; + $element = 'supplierproposal'; + $classfile = 'supplier_proposal'; + $subelement = 'supplierproposal'; } elseif ($element_type == 'shipping') { $classpath = 'expedition/class'; $subelement = 'expedition'; @@ -11321,6 +11335,9 @@ function getElementProperties($element_type) } elseif ($element_type == "service") { $classpath = 'product/class'; $subelement = 'product'; + } elseif ($objecttype == 'salary') { + $classpath = 'salaries/class'; + $module = 'salaries'; } if (empty($classfile)) { diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index aa82aaecb9c..2cd5e28bb24 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -2477,6 +2477,9 @@ class SupplierProposal extends CommonObject public function getTooltipContentArray($params) { global $conf, $langs, $menumanager; + + $langs->load('supplier_proposal'); + if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { return ['optimize' => $langs->trans("ShowSupplierProposal")]; }