Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: correctly display the products of a warehouse in the pdf

Browse Source
This commit is contained in:
Ferran Marcet
2021-11-26 12:49:07 +01:00
parent 419eaa217f
commit 5265cd8084
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/core/modules/stock/doc/pdf_standard.modules.php
View File

@@ -289,8 +289,8 @@ class pdf_standard extends ModelePDFStock
$pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0, 0, 0);
$tab_top = 80 + $top_shift;
$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
$tab_top = 65 + $top_shift;
$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 65 + $top_shift : 10);
$tab_height = 130;
@@ -323,7 +323,7 @@ class pdf_standard extends ModelePDFStock
$i = 0;
$nblines = $num;
$this->tabTitleHeight = 0;
$this->tabTitleHeight = 10;
$nexY = $tab_top + $this->tabTitleHeight;
for ($i = 0; $i < $nblines; $i++)
@@ -362,7 +362,8 @@ class pdf_standard extends ModelePDFStock
$showpricebeforepagebreak = 1;
$pdf->startTransaction();
pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
$pdf->writeHTMLCell($this->wref, 3, $curX, $curY, $outputlangs->convToOutputCharset($objp->ref), 0, 1, false, true, 'J', true);
//pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
$pageposafter = $pdf->getPage();
if ($pageposafter > $pageposbefore) // There is a pagebreak
{
@@ -370,7 +371,8 @@ class pdf_standard extends ModelePDFStock
$pageposafter = $pageposbefore;
//print $pageposafter.'-'.$pageposbefore;exit;
$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
$pdf->writeHTMLCell($this->wref, 4, $curX, $curY, $outputlangs->convToOutputCharset($objp->ref), 0, 1, false, true, 'J', true);
//pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
$pageposafter = $pdf->getPage();
$posyafter = $pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) // There is no space left for total+free text
@@ -418,8 +420,8 @@ class pdf_standard extends ModelePDFStock
$productstatic->status_batch = $objp->tobatch;
// Ref.
$pdf->SetXY($this->posxdesc, $curY);
$pdf->MultiCell($this->wref, 3, $productstatic->ref, 0, 'L');
//$pdf->SetXY($this->posxdesc, $curY);
//$pdf->MultiCell($this->wref, 3, $productstatic->ref, 0, 'L');
// Label
$pdf->SetXY($this->posxlabel + 0.8, $curY);
@@ -506,7 +508,7 @@ class pdf_standard extends ModelePDFStock
/**
* Footer table
*/
$nexY = $pdf->GetY();
//$nexY = $pdf->GetY();
$nexY += 2;
$curY = $nexY;
@@ -572,11 +574,11 @@ class pdf_standard extends ModelePDFStock
$height_note = 0;
}
$iniY = $tab_top + 7;
/*$iniY = $tab_top + 7;
$curY = $tab_top + 7;
$nexY = $tab_top + 7;
$tab_top = $tab_top_newpage + 25 + $top_shift;
$tab_top = $tab_top_newpage + 25 + $top_shift;*/
// Show square
if ($pagenb == 1)
@@ -732,10 +734,12 @@ class pdf_standard extends ModelePDFStock
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("EstimatedStockValueSellShort"), '', 'R');
}
$pdf->SetDrawColor(200, 200, 200);
$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
$pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11);
$pdf->SetLineStyle(array('dash'=>0));
if (empty($hidetop)) {
$pdf->SetDrawColor(200, 200, 200);
$pdf->SetLineStyle(array('dash' => '0', 'color' => array(200, 200, 200)));
$pdf->line($this->marge_gauche, $tab_top + 10, $this->page_largeur - $this->marge_droite, $tab_top + 10);
$pdf->SetLineStyle(array('dash' => 0));
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore