diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 5f8380dd9d8..df9843fbff5 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -649,6 +649,7 @@ if ($resql) {
// 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).' | ';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index ff0350a9552..54dcdd14700 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -2357,10 +2357,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).(!empty($elementobject->ref_client) ? ' ('.$elementobject->ref_client.')' : '').(!empty($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($elementobject->ref).(empty($elementobject->ref_client) ?'' : ' ('.$elementobject->ref_client.')').(empty($elementobject->ref_supplier) ? '' : ' ('.$elementobject->ref_supplier.')').' ');
+ $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);
@@ -2391,9 +2391,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) {
@@ -2411,11 +2411,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) {
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 79ee8c6172e..5b314958012 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -419,7 +419,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);
}