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

Fix: add pdf_writeLinkedObjects method

Browse Source
This commit is contained in:
Regis Houssin 2012-03-02 14:46:18 +01:00
parent 9301def08d
commit 30c7bf811b
6 changed files with 46 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -661,6 +661,39 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
} }
} }
/**
* Show linked objects for PDF generation
*
* @param PDF &$pdf Object PDF
* @param object $object Object
* @param Translate $outputlangs Object lang
* @param int $curx X
* @param int $cury Y
* @return void
*/
function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$align,$default_font_size,$hookmanager=false)
{
$linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager);
if (! empty($linkedobjects))
{
foreach($linkedobjects as $linkedobject)
{
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(100, 3, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', $align);
if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"]))
{
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->MultiCell(100, 3, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align);
}
}
}
return $pdf->getY();
}
/** /**
* Output line description into PDF * Output line description into PDF
@ -1606,7 +1639,7 @@ function pdf_getCurrencySymbol(&$pdf, $currency_code)
} }
/** /**
* Show linked objects for PDF generation * Return linked objects
* *
* @param object $object Object * @param object $object Object
* @param Translate $outputlangs Object lang for output * @param Translate $outputlangs Object lang for output
@ -1618,7 +1651,7 @@ function pdf_getLinkedObjects($object,$outputlangs,$hookmanager=false)
$linkedobjects=array(); $linkedobjects=array();
$object->fetchObjectLinked(); $object->fetchObjectLinked();
foreach($object->linkedObjects as $objecttype => $objects) foreach($object->linkedObjects as $objecttype => $objects)
{ {
if ($objecttype == 'propal') if ($objecttype == 'propal')

19
htdocs/core/modules/commande/doc/pdf_edison.modules.php
View File

@ -649,23 +649,10 @@ class pdf_edison extends ModelePDFCommandes
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->ref), 0, 'L'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->ref), 0, 'L');
$posy+=1; $posy+=1;
// Add list of linked objects // Show list of linked objects
$linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 'L', $default_font_size, $hookmanager);
if (! empty($linkedobjects))
{
foreach($linkedobjects as $linkedobject)
{
$posy+=3;
$pdf->SetXY(11,$posy);
$pdf->SetFont('','', $default_font_size + 1);
$pdf->MultiCell(100, 4, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', 'L');
$posy+=4;
$pdf->SetXY(11,$posy);
$pdf->MultiCell(100, 4, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', 'L');
}
}
} }
/** /**

17
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -929,21 +929,8 @@ class pdf_einstein extends ModelePDFCommandes
$posy+=2; $posy+=2;
// Add list of linked objects // Show list of linked objects
$linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 'R', $default_font_size, $hookmanager);
if (! empty($linkedobjects))
{
foreach($linkedobjects as $linkedobject)
{
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(100, 3, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', 'R');
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->MultiCell(100, 3, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', 'R');
}
}
if ($showaddress) if ($showaddress)
{ {

17
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1125,21 +1125,8 @@ class pdf_crabe extends ModelePDFFactures
$posy+=2; $posy+=2;
// Add list of linked objects // Show list of linked objects
$linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 'R', $default_font_size, $hookmanager);
if (! empty($linkedobjects))
{
foreach($linkedobjects as $linkedobject)
{
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(100, 3, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', 'R');
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->MultiCell(100, 3, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', 'R');
}
}
if ($showaddress) if ($showaddress)
{ {

17
htdocs/core/modules/facture/doc/pdf_oursin.modules.php
View File

@ -1002,21 +1002,8 @@ class pdf_oursin extends ModelePDFFactures
$posy+=1; $posy+=1;
// Add list of linked objects // Show list of linked objects
$linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 'L', $default_font_size, $hookmanager);
if (! empty($linkedobjects))
{
foreach($linkedobjects as $linkedobject)
{
$posy+=3;
$pdf->SetXY($this->marges['g'],$posy);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(60, 3, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', 'L');
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->MultiCell(60, 3, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', 'L');
}
}
// Amount in (at tab_top - 1) // Amount in (at tab_top - 1)
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);

17
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -970,21 +970,8 @@ class pdf_azur extends ModelePDFPropales
$posy+=2; $posy+=2;
// Add list of linked objects // Show list of linked objects
$linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 'R', $default_font_size, $hookmanager);
if (! empty($linkedobjects))
{
foreach($linkedobjects as $linkedobject)
{
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->MultiCell(100, 3, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', 'R');
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->MultiCell(100, 3, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', 'R');
}
}
if ($showaddress) if ($showaddress)
{ {