parent
a6ca6b1b84
commit
677109df41
14 changed files with 16 additions and 17 deletions
|
|
@ -1007,7 +1007,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
|
|||
* @param int $showdetails Show company adress details into footer (0=Nothing, 1=Show address, 2=Show managers, 3=Both)
|
||||
* @param int $hidefreetext 1=Hide free text, 0=Show free text
|
||||
* @param int $page_largeur Page width
|
||||
* @param int $watermark Watermark text to print on page
|
||||
* @param string $watermark Watermark text to print on page
|
||||
* @return int Return height of bottom margin including footer text
|
||||
*/
|
||||
function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0, $page_largeur = 0, $watermark = '')
|
||||
|
|
@ -2214,12 +2214,11 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
|
|||
* @param int $i Current line number
|
||||
* @param Translate $outputlangs Object langs for output
|
||||
* @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
|
||||
* @param HookManager $hookmanager Hook manager instance
|
||||
* @return string Value for unit cell
|
||||
*/
|
||||
function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = false)
|
||||
function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0)
|
||||
{
|
||||
global $langs;
|
||||
global $hookmanager, $langs;
|
||||
|
||||
$reshook = 0;
|
||||
$result = '';
|
||||
|
|
|
|||
|
|
@ -469,7 +469,7 @@ class pdf_einstein extends ModelePDFCommandes
|
|||
|
||||
// Unit
|
||||
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$pdf->SetXY($this->posxunit, $curY);
|
||||
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ class pdf_eratosthene extends ModelePDFCommandes
|
|||
|
||||
// Unit
|
||||
if ($this->getColumnStatus('unit')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
|
||||
$nexY = max($pdf->GetY(), $nexY);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -673,7 +673,7 @@ class pdf_crabe extends ModelePDFFactures
|
|||
|
||||
// Unit
|
||||
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$pdf->SetXY($this->posxunit, $curY);
|
||||
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -807,7 +807,7 @@ class pdf_sponge extends ModelePDFFactures
|
|||
|
||||
// Unit
|
||||
if ($this->getColumnStatus('unit')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
|
||||
$nexY = max($pdf->GetY(), $nexY);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ class pdf_standard extends ModelePDFProduct
|
|||
// Unit
|
||||
if($conf->global->PRODUCT_USE_UNITS)
|
||||
{
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$pdf->SetXY($this->posxunit, $curY);
|
||||
$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -582,7 +582,7 @@ class pdf_azur extends ModelePDFPropales
|
|||
|
||||
// Unit
|
||||
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$pdf->SetXY($this->posxunit, $curY);
|
||||
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -671,7 +671,7 @@ class pdf_cyan extends ModelePDFPropales
|
|||
|
||||
// Unit
|
||||
if ($this->getColumnStatus('unit')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
|
||||
$nexY = max($pdf->GetY(), $nexY);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
|
|||
|
||||
// Unit
|
||||
if ($this->getColumnStatus('unit')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
|
||||
$nexY = max($pdf->GetY(), $nexY);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
|
|||
|
||||
// Unit
|
||||
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$pdf->SetXY($this->posxunit, $curY);
|
||||
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -605,7 +605,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
|
|||
|
||||
// Unit
|
||||
if ($this->getColumnStatus('unit')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
|
||||
$nexY = max($pdf->GetY(), $nexY);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -505,7 +505,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||
|
||||
// Unit
|
||||
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$pdf->SetXY($this->posxunit, $curY);
|
||||
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -489,7 +489,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
|
|||
|
||||
// Unit
|
||||
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$pdf->SetXY($this->posxunit, $curY);
|
||||
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
|
|||
|
||||
// Unit
|
||||
if ($this->getColumnStatus('unit')) {
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
|
||||
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
|
||||
$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
|
||||
$nexY = max($pdf->GetY(), $nexY);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue