lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to show ref of linked object on documents. Fix is not complete but

Browse Source 
stable.
This commit is contained in:
Laurent Destailleur 2015-12-21 12:52:10 +01:00
parent fec5f4e20b
commit 536413523a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/lib/pdf.lib.php
View File

@ -1008,17 +1008,16 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al
{ {
foreach($linkedobjects as $linkedobject) foreach($linkedobjects as $linkedobject)
{ {
$reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
if (! empty($linkedobject["date_value"]))
{
$reftoshow .= ' / '.$linkedobject["date_value"];
}
$posy+=3; $posy+=3;
$pdf->SetXY($posx,$posy); $pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell($w, $h, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', $align); $pdf->MultiCell($w, $h, $reftoshow, '', $align);
if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"]))
{
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->MultiCell($w, $h, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align);
}
} }
} }
@ -1826,10 +1825,11 @@ function pdf_getTotalQty($object,$type,$outputlangs)
/** /**
* Return linked objects * Return linked objects
* FIXME This function returns only one link per link type instead of all links. If we fix this, we must also fix function pdf_writeLinkedObjects
* *
* @param object $object Object * @param object $object Object
* @param Translate $outputlangs Object lang for output * @param Translate $outputlangs Object lang for output
* @return array Linked objects * @return array Linked objects
*/ */
function pdf_getLinkedObjects($object,$outputlangs) function pdf_getLinkedObjects($object,$outputlangs)
{ {