lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24354 from frederic34/account_tooltip

Browse Source 
fix ajax tooltip for account
This commit is contained in:
Laurent Destailleur 2023-03-28 17:14:20 +02:00 committed by GitHub
commit 4faeea1476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/bank/class/account.class.php
View File

@ -1416,6 +1416,7 @@ class Account extends CommonObject
public function getTooltipContentArray($params) public function getTooltipContentArray($params)
{ {
global $langs; global $langs;
$langs->loadLangs(['banks', 'compta']);
include_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
$datas = array(); $datas = array();

66
htdocs/core/lib/functions.lib.php
View File

@ -11239,87 +11239,86 @@ function getElementProperties($element_type)
$subelement = $regs[2]; $subelement = $regs[2];
} }
// For compat // For compat and To work with non standard path
if ($element_type == "action") { if ($element_type == "action") {
$classpath = 'comm/action/class'; $classpath = 'comm/action/class';
$subelement = 'Actioncomm'; $subelement = 'Actioncomm';
$module = 'agenda'; $module = 'agenda';
} } elseif ($element_type == 'bank_account') {
$classpath = 'compta/bank/class';
// To work with non standard path $module = 'banque';
if ($element_type == 'facture' || $element_type == 'invoice') { $classfile = 'Account';
$classname = 'Account';
} elseif ($element_type == 'stock') {
$classpath = 'product/stock/class';
$classfile = 'entrepot';
$classname = 'Entrepot';
} elseif ($element_type == 'project') {
$classpath = 'projet/class';
$module = 'projet';
} elseif ($element_type == 'project_task') {
$classpath = 'projet/class';
$module = 'projet';
$subelement = 'task';
} elseif ($element_type == 'facture' || $element_type == 'invoice') {
$classpath = 'compta/facture/class'; $classpath = 'compta/facture/class';
$module = 'facture'; $module = 'facture';
$subelement = 'facture'; $subelement = 'facture';
} } elseif ($element_type == 'commande' || $element_type == 'order') {
if ($element_type == 'commande' || $element_type == 'order') {
$classpath = 'commande/class'; $classpath = 'commande/class';
$module = 'commande'; $module = 'commande';
$subelement = 'commande'; $subelement = 'commande';
} } elseif ($element_type == 'propal') {
if ($element_type == 'propal') {
$classpath = 'comm/propal/class'; $classpath = 'comm/propal/class';
} } elseif ($element_type == 'supplier_proposal') {
if ($element_type == 'supplier_proposal') {
$classpath = 'supplier_proposal/class'; $classpath = 'supplier_proposal/class';
} } elseif ($element_type == 'shipping') {
if ($element_type == 'shipping') {
$classpath = 'expedition/class'; $classpath = 'expedition/class';
$subelement = 'expedition'; $subelement = 'expedition';
$module = 'expedition_bon'; $module = 'expedition_bon';
} } elseif ($element_type == 'delivery') {
if ($element_type == 'delivery') {
$classpath = 'delivery/class'; $classpath = 'delivery/class';
$subelement = 'delivery'; $subelement = 'delivery';
$module = 'delivery_note'; $module = 'delivery_note';
} } elseif ($element_type == 'contract') {
if ($element_type == 'contract') {
$classpath = 'contrat/class'; $classpath = 'contrat/class';
$module = 'contrat'; $module = 'contrat';
$subelement = 'contrat'; $subelement = 'contrat';
} } elseif ($element_type == 'member') {
if ($element_type == 'member') {
$classpath = 'adherents/class'; $classpath = 'adherents/class';
$module = 'adherent'; $module = 'adherent';
$subelement = 'adherent'; $subelement = 'adherent';
} } elseif ($element_type == 'cabinetmed_cons') {
if ($element_type == 'cabinetmed_cons') {
$classpath = 'cabinetmed/class'; $classpath = 'cabinetmed/class';
$module = 'cabinetmed'; $module = 'cabinetmed';
$subelement = 'cabinetmedcons'; $subelement = 'cabinetmedcons';
} } elseif ($element_type == 'fichinter') {
if ($element_type == 'fichinter') {
$classpath = 'fichinter/class'; $classpath = 'fichinter/class';
$module = 'ficheinter'; $module = 'ficheinter';
$subelement = 'fichinter'; $subelement = 'fichinter';
} } elseif ($element_type == 'dolresource' || $element_type == 'resource') {
if ($element_type == 'dolresource' || $element_type == 'resource') {
$classpath = 'resource/class'; $classpath = 'resource/class';
$module = 'resource'; $module = 'resource';
$subelement = 'dolresource'; $subelement = 'dolresource';
} } elseif ($element_type == 'propaldet') {
if ($element_type == 'propaldet') {
$classpath = 'comm/propal/class'; $classpath = 'comm/propal/class';
$module = 'propal'; $module = 'propal';
$subelement = 'propaleligne'; $subelement = 'propaleligne';
} } elseif ($element_type == 'order_supplier') {
if ($element_type == 'order_supplier') {
$classpath = 'fourn/class'; $classpath = 'fourn/class';
$module = 'fournisseur'; $module = 'fournisseur';
$classfile = 'fournisseur.commande'; $classfile = 'fournisseur.commande';
$element = 'commande'; $element = 'commande';
$subelement = ''; $subelement = '';
$classname = 'CommandeFournisseur'; $classname = 'CommandeFournisseur';
} } elseif ($element_type == 'invoice_supplier') {
if ($element_type == 'invoice_supplier') {
$classpath = 'fourn/class'; $classpath = 'fourn/class';
$module = 'fournisseur'; $module = 'fournisseur';
$classfile = 'fournisseur.facture'; $classfile = 'fournisseur.facture';
$element = 'facture'; $element = 'facture';
$subelement = ''; $subelement = '';
$classname = 'FactureFournisseur'; $classname = 'FactureFournisseur';
} } elseif ($element_type == "service") {
if ($element_type == "service") {
$classpath = 'product/class'; $classpath = 'product/class';
$subelement = 'product'; $subelement = 'product';
} }
@ -11361,7 +11360,6 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
$ret = 0; $ret = 0;
$element_prop = getElementProperties($element_type); $element_prop = getElementProperties($element_type);
if (is_array($element_prop) && isModEnabled($element_prop['module'])) { if (is_array($element_prop) && isModEnabled($element_prop['module'])) {
dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php'); dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');