Skip to content

Commit fd970b5

Browse files
committed
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
2 parents 259f8f5 + 2843597 commit fd970b5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

htdocs/core/class/html.formsetup.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,10 +706,10 @@ public function loadValueFromConf()
706706
{
707707
global $conf;
708708
if (isset($conf->global->{$this->confKey})) {
709-
$this->fieldValue = getDolGlobalString($this->confKey);
709+
$this->fieldValue = getDolGlobalString($this->confKey, null);
710710
return true;
711711
} else {
712-
$this->fieldValue = '';
712+
$this->fieldValue = null;
713713
return false;
714714
}
715715
}

htdocs/core/modules/facture/doc/pdf_crabe.modules.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,7 @@ protected function _tableau_info(&$pdf, $object, $posy, $outputlangs, $outputlan
13591359

13601360
$langs->loadLangs(array('payment', 'paybox', 'stripe'));
13611361
$servicename = $langs->transnoentities('Online');
1362+
13621363
$paiement_url = getOnlinePaymentUrl(0, 'invoice', $object->ref, 0, '', 0);
13631364
$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>';
13641365

0 commit comments

Comments
 (0)