From 23d535197d4cffcec44d763bc5ad21c39bf2c02a Mon Sep 17 00:00:00 2001 From: daraelmin Date: Wed, 4 Jan 2023 09:13:40 +0100 Subject: [PATCH 1/4] Fix v14 fatal error undefined fct lenght_accounta Following #23403 See https://www.dolibarr.fr/forum/t/erreur-fatal-paiements-divers-v15-0-3/41914 --- htdocs/compta/bank/various_payment/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index dda68a096a1..3863cde1ab9 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -650,6 +650,7 @@ if ($result) { // Accounting account if ($arrayfields['account']['checked']) { + require_once(DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'); $accountingaccount->fetch('', $obj->accountancy_code, 1); print ''.$accountingaccount->getNomUrl(0, 1, 1, '', 1).''; From 1d29400cdfa9b8883af73734de97d0d35c7248c1 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 4 Jan 2023 08:15:39 +0000 Subject: [PATCH 2/4] Fixing style errors. --- htdocs/compta/bank/various_payment/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index 3863cde1ab9..cf19962489d 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -650,7 +650,7 @@ if ($result) { // Accounting account if ($arrayfields['account']['checked']) { - require_once(DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; $accountingaccount->fetch('', $obj->accountancy_code, 1); print ''.$accountingaccount->getNomUrl(0, 1, 1, '', 1).''; From e7d31a821c35fe6237a35b49dd9caf186e7f48e5 Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Thu, 5 Jan 2023 15:41:57 +0100 Subject: [PATCH 3/4] FIX : hierarchyme and not hierachyme --- htdocs/projet/activity/permonth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php index 6e474ea8568..21741a55f01 100644 --- a/htdocs/projet/activity/permonth.php +++ b/htdocs/projet/activity/permonth.php @@ -418,7 +418,7 @@ if (! empty($conf->categorie->enabled)) // If the user can view user other than himself $moreforfilter .= '
'; $moreforfilter .= '
'; -$includeonly = 'hierachyme'; +$includeonly = 'hierarchyme'; if (empty($user->rights->user->user->lire)) { $includeonly = array($user->id); } From 10018d48a97bc949d677309365e9ac27d58c1059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Cendrier?= Date: Fri, 6 Jan 2023 11:46:59 +0100 Subject: [PATCH 4/4] do not add
when dol_concatdesc already does it --- htdocs/core/lib/pdf.lib.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index eff818fe01d..fef33262a0f 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2307,10 +2307,10 @@ function pdf_getLinkedObjects(&$object, $outputlangs) $outputlangs->load('orders'); if (count($objects) > 1 && count($objects) <= (getDolGlobalInt("MAXREFONDOC") ? getDolGlobalInt("MAXREFONDOC") : 10)) { - $object->note_public = dol_concatdesc($object->note_public, '
'.$outputlangs->transnoentities("RefOrder").' :
'); + $object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefOrder").' :'); foreach ($objects as $elementobject) { $object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '); - $object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("OrderDate").' : '.dol_print_date($elementobject->date, 'day', '', $outputlangs).'
'); + $object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("OrderDate").' : '.dol_print_date($elementobject->date, 'day', '', $outputlangs)); } } elseif (count($objects) == 1) { $elementobject = array_shift($objects); @@ -2341,9 +2341,9 @@ function pdf_getLinkedObjects(&$object, $outputlangs) if (count($objects) > 1) { $order = null; if (empty($object->linkedObjects['commande']) && $object->element != 'commande') { - $object->note_public = dol_concatdesc($object->note_public, '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'); + $object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :'); } else { - $object->note_public = dol_concatdesc($object->note_public, '
'.$outputlangs->transnoentities("RefSending").' :
'); + $object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefSending").' :'); } // We concat this record info into fields xxx_value. title is overwrote. foreach ($objects as $elementobject) { @@ -2361,11 +2361,9 @@ function pdf_getLinkedObjects(&$object, $outputlangs) if (! is_object($order)) { $object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref)); - $object->note_public = dol_concatdesc($object->note_public, '
'); } else { $object->note_public = dol_concatdesc($object->note_public, $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '')); $object->note_public = dol_concatdesc($object->note_public, ' / '.$outputlangs->transnoentities($elementobject->ref)); - $object->note_public = dol_concatdesc($object->note_public, '
'); } } } elseif (count($objects) == 1) {