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

This commit is contained in:
ldestailleur 2025-03-03 16:58:17 +01:00
commit fd970b582a
2 changed files with 3 additions and 2 deletions

View file

@ -706,10 +706,10 @@ class FormSetupItem
{
global $conf;
if (isset($conf->global->{$this->confKey})) {
$this->fieldValue = getDolGlobalString($this->confKey);
$this->fieldValue = getDolGlobalString($this->confKey, null);
return true;
} else {
$this->fieldValue = '';
$this->fieldValue = null;
return false;
}
}

View file

@ -1359,6 +1359,7 @@ class pdf_crabe extends ModelePDFFactures
$langs->loadLangs(array('payment', 'paybox', 'stripe'));
$servicename = $langs->transnoentities('Online');
$paiement_url = getOnlinePaymentUrl(0, 'invoice', $object->ref, 0, '', 0);
$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>';