Skip to content

Fix v20 linked doc note info repeated #31462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eldy merged 3 commits into from
Oct 24, 2024
Merged

Fix v20 linked doc note info repeated #31462

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2f06c1
FIX : space used by linked elements in PDF notes
thersane-john Oct 18, 2024
5c21c62
fix data repeated on object public note
thersane-john Oct 18, 2024
fd6b8b2
Merge branch '20.0' of https://github.com/Dolibarr/dolibarr into fix_…
thersane-john Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions htdocs/core/lib/pdf.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2501,10 +2501,12 @@ 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").' :');
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));
if (empty($object->context['DolPublicNoteAppendedGetLinkedObjects'])) { // Check if already appended before add to avoid repeat data
$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));
}
}
} elseif (count($objects) == 1) {
$elementobject = array_shift($objects);
Expand Down Expand Up @@ -2563,7 +2565,9 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
}
}

$object->note_public = dol_concatdesc($object->note_public, $refListsTxt);
if (empty($object->context['DolPublicNoteAppendedGetLinkedObjects'])) { // Check if already appended before add to avoid repeat data
$object->note_public = dol_concatdesc($object->note_public, $refListsTxt);
}
} elseif (count($objects) == 1) {
$elementobject = array_shift($objects);
$order = null;
Expand Down Expand Up @@ -2601,6 +2605,8 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
}
}

$object->context['DolPublicNoteAppendedGetLinkedObjects'] = 1;

// For add external linked objects
if (is_object($hookmanager)) {
$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs' => $outputlangs);
Expand Down