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

This commit is contained in:
Laurent Destailleur 2026-06-09 11:53:38 +02:00
commit d2d548bd1d
3 changed files with 16 additions and 5 deletions

View file

@ -10818,6 +10818,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
'@phan-var-force Expedition $object';
/** @var Expedition $object */
$substitutionarray['__URL_SHIPMENT__'] = DOL_MAIN_URL_ROOT . "/expedition/card.php?id=" . $object->id;
if (getDolGlobalInt('EXPEDITION_ALLOW_ONLINESIGN')) {
require_once DOL_DOCUMENT_ROOT . '/core/lib/signature.lib.php';
$substitutionarray['__ONLINE_SIGN_URL__'] = getOnlineSignatureUrl(0, 'expedition', $object->ref, 1, $object);
}
}
}

View file

@ -30,7 +30,7 @@
*/
function subtotals_completesubstitutionarray_lines(&$substitutionarray, $langs, $object, $line)
{
if (defined('SUBTOTALS_SPECIAL_CODE')) {
if (defined('SUBTOTALS_SPECIAL_CODE') && property_exists($object, 'ALLOWED_TYPES') && (in_array($object->element, $object::$ALLOWED_TYPES))) {
$substitutionarray['is_subtotals_line'] = ($line->special_code == constant('SUBTOTALS_SPECIAL_CODE'));
$substitutionarray['is_not_subtotals_line'] = !$substitutionarray['is_subtotals_line'];
$substitutionarray['is_subtotals_title'] = (($line->special_code == constant('SUBTOTALS_SPECIAL_CODE')) && $line->qty > 0);

View file

@ -1513,7 +1513,9 @@ class Ticket extends CommonObject
$labelStatus = (isset($status) && !empty($this->labelStatus[$status])) ? $this->labelStatus[$status] : '';
$labelStatusShort = (isset($status) && !empty($this->labelStatusShort[$status])) ? $this->labelStatusShort[$status] : '';
$statusType = '';
$isUnknown = false;
switch ($status) {
case self::STATUS_NOT_READ: // Not read
$statusType = 'status0';
@ -1540,10 +1542,8 @@ class Ticket extends CommonObject
$statusType = 'status6';
break;
default:
$labelStatus = 'Unknown';
$labelStatusShort = 'Unknown';
$statusType = 'status0';
$mode = 0;
$isUnknown = true;
break;
}
$parameters = array(
@ -1558,6 +1558,13 @@ class Ticket extends CommonObject
return $hookmanager->resPrint;
}
if ($isUnknown) {
$labelStatus = 'Unknown';
$labelStatusShort = 'Unknown';
$statusType = 'status0';
$mode = 0;
}
$params = array();
if ($notooltip) {
$params = array('tooltip' => 'no');