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

Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2024-08-21 02:45:37 +02:00
parent 3c78580471 16681ce7b0
commit e08fd29d0f
109 changed files with 872 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4861,8 +4861,8 @@ function getPictoForType($key, $morecss = '')
'select' => 'list',
'sellist' => 'list',
'radio' => 'check-circle',
'checkbox' => 'check-square',
'chkbxlst' => 'check-square',
'checkbox' => 'list',
'chkbxlst' => 'list',
'link' => 'link',
'icon' => "question",
'point' => "country",
@@ -4932,6 +4932,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
$pictowithouttext = str_replace('object_', '', $pictowithouttext);
$pictowithouttext = str_replace('_nocolor', '', $pictowithouttext);
// Fix some values of $pictowithouttext
$pictoconvertkey = array('facture' => 'bill', 'shipping' => 'shipment', 'fichinter' => 'intervention', 'agenda' => 'calendar', 'invoice_supplier' => 'supplier_invoice', 'order_supplier' => 'supplier_order');
if (in_array($pictowithouttext, array_keys($pictoconvertkey))) {
$pictowithouttext = $pictoconvertkey[$pictowithouttext];
}
if (strpos($pictowithouttext, 'fontawesome_') === 0 || strpos($pictowithouttext, 'fa-') === 0) {
// This is a font awesome image 'fontawesome_xxx' or 'fa-xxx'
$pictowithouttext = str_replace('fontawesome_', '', $pictowithouttext);
@@ -13854,7 +13860,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id);
}
if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
if ((is_object($filterobj) && get_class($filterobj) == 'Societe') || (is_object($filterobj) && get_class($filterobj) == 'Contact')) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
@@ -13911,6 +13917,11 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
if ($filterobj->id) {
$sql .= " AND a.fk_element = ".((int) $filterobj->id);
}
} elseif (is_object($filterobj) && get_class($filterobj) == 'Contact' && $filterobj->id) {
$sql .= " AND a.fk_contact = sp.rowid";
if ($filterobj->id) {
$sql .= " AND a.fk_contact = ".((int) $filterobj->id);
}
}
} else {
$sql .= " AND u.rowid = ". ((int) $filterobj->id);