commit
64ef6fe4ad
@ -1624,6 +1624,8 @@ class Categorie extends CommonObject
|
|||||||
{
|
{
|
||||||
global $langs;
|
global $langs;
|
||||||
|
|
||||||
|
$langs->load('categories');
|
||||||
|
|
||||||
$datas = [];
|
$datas = [];
|
||||||
|
|
||||||
$datas['label'] = $langs->trans("ShowCategory").': '.($this->ref ? $this->ref : $this->label);
|
$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')) {
|
if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
|
||||||
$classfortooltip = 'classforajaxtooltip';
|
$classfortooltip = 'classforajaxtooltip';
|
||||||
$dataparams = ' data-params='.json_encode($params);
|
$dataparams = ' data-params='.json_encode($params);
|
||||||
// $label = $langs->trans('Loading');
|
|
||||||
}
|
}
|
||||||
$label = implode($this->getTooltipContentArray($params));
|
$label = implode($this->getTooltipContentArray($params));
|
||||||
|
|
||||||
|
|||||||
@ -11244,11 +11244,21 @@ function getElementProperties($element_type)
|
|||||||
$classpath = 'comm/action/class';
|
$classpath = 'comm/action/class';
|
||||||
$subelement = 'Actioncomm';
|
$subelement = 'Actioncomm';
|
||||||
$module = 'agenda';
|
$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') {
|
} elseif ($element_type == 'bank_account') {
|
||||||
$classpath = 'compta/bank/class';
|
$classpath = 'compta/bank/class';
|
||||||
$module = 'banque';
|
$module = 'banque';
|
||||||
$classfile = 'Account';
|
$classfile = 'Account';
|
||||||
$classname = 'Account';
|
$classname = 'Account';
|
||||||
|
} elseif ($element_type == 'category') {
|
||||||
|
$classpath = 'categories/class';
|
||||||
|
$module = 'categorie';
|
||||||
|
$subelement = 'categorie';
|
||||||
} elseif ($element_type == 'stock') {
|
} elseif ($element_type == 'stock') {
|
||||||
$classpath = 'product/stock/class';
|
$classpath = 'product/stock/class';
|
||||||
$classfile = 'entrepot';
|
$classfile = 'entrepot';
|
||||||
@ -11272,6 +11282,10 @@ function getElementProperties($element_type)
|
|||||||
$classpath = 'comm/propal/class';
|
$classpath = 'comm/propal/class';
|
||||||
} elseif ($element_type == 'supplier_proposal') {
|
} elseif ($element_type == 'supplier_proposal') {
|
||||||
$classpath = 'supplier_proposal/class';
|
$classpath = 'supplier_proposal/class';
|
||||||
|
$module = 'supplier_proposal';
|
||||||
|
$element = 'supplierproposal';
|
||||||
|
$classfile = 'supplier_proposal';
|
||||||
|
$subelement = 'supplierproposal';
|
||||||
} elseif ($element_type == 'shipping') {
|
} elseif ($element_type == 'shipping') {
|
||||||
$classpath = 'expedition/class';
|
$classpath = 'expedition/class';
|
||||||
$subelement = 'expedition';
|
$subelement = 'expedition';
|
||||||
@ -11321,6 +11335,9 @@ function getElementProperties($element_type)
|
|||||||
} elseif ($element_type == "service") {
|
} elseif ($element_type == "service") {
|
||||||
$classpath = 'product/class';
|
$classpath = 'product/class';
|
||||||
$subelement = 'product';
|
$subelement = 'product';
|
||||||
|
} elseif ($objecttype == 'salary') {
|
||||||
|
$classpath = 'salaries/class';
|
||||||
|
$module = 'salaries';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($classfile)) {
|
if (empty($classfile)) {
|
||||||
|
|||||||
@ -2477,6 +2477,9 @@ class SupplierProposal extends CommonObject
|
|||||||
public function getTooltipContentArray($params)
|
public function getTooltipContentArray($params)
|
||||||
{
|
{
|
||||||
global $conf, $langs, $menumanager;
|
global $conf, $langs, $menumanager;
|
||||||
|
|
||||||
|
$langs->load('supplier_proposal');
|
||||||
|
|
||||||
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
|
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
|
||||||
return ['optimize' => $langs->trans("ShowSupplierProposal")];
|
return ['optimize' => $langs->trans("ShowSupplierProposal")];
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user