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

Undo changes

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