Fixing style errors.
This commit is contained in:
parent
db6a2844ad
commit
35f3742d08
@ -206,7 +206,7 @@ class pdf_testD extends ModelePDFMo
|
|||||||
$nblines = count($object->lines);
|
$nblines = count($object->lines);
|
||||||
|
|
||||||
//Change descriptionfield
|
//Change descriptionfield
|
||||||
$showsupplierSKU = False;
|
$showsupplierSKU = false;
|
||||||
|
|
||||||
$hidetop = 0;
|
$hidetop = 0;
|
||||||
if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
|
if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
|
||||||
@ -508,7 +508,7 @@ class pdf_testD extends ModelePDFMo
|
|||||||
$curX = $this->posxdesc - 1;
|
$curX = $this->posxdesc - 1;
|
||||||
$showpricebeforepagebreak = 1;
|
$showpricebeforepagebreak = 1;
|
||||||
|
|
||||||
if ($this->getColumnStatus('code')) {
|
if ($this->getColumnStatus('code')) {
|
||||||
$pdf->startTransaction(); //description
|
$pdf->startTransaction(); //description
|
||||||
//$this->printColDescContent($pdf, $curY, 'code', $object, $i, $outputlangs, $hideref, $hidedesc, $showsupplierSKU);
|
//$this->printColDescContent($pdf, $curY, 'code', $object, $i, $outputlangs, $hideref, $hidedesc, $showsupplierSKU);
|
||||||
$this->printStdColumnContent($pdf, $curY, 'code', $prod->ref);
|
$this->printStdColumnContent($pdf, $curY, 'code', $prod->ref);
|
||||||
@ -575,7 +575,7 @@ class pdf_testD extends ModelePDFMo
|
|||||||
|
|
||||||
$pageposafter = $pdf->getPage();
|
$pageposafter = $pdf->getPage();
|
||||||
$posyafter = $pdf->GetY();
|
$posyafter = $pdf->GetY();
|
||||||
} elseif ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) { // There is no space left for total+free text
|
} elseif ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) { // There is no space left for total+free text
|
||||||
if ($i == ($nblines - 1)) { // No more lines, and no space left to show total, so we create a new page
|
if ($i == ($nblines - 1)) { // No more lines, and no space left to show total, so we create a new page
|
||||||
$pdf->AddPage('', '', true);
|
$pdf->AddPage('', '', true);
|
||||||
if (!empty($tplidx)) {
|
if (!empty($tplidx)) {
|
||||||
@ -596,10 +596,10 @@ class pdf_testD extends ModelePDFMo
|
|||||||
{
|
{
|
||||||
$pdf->commitTransaction();
|
$pdf->commitTransaction();
|
||||||
}
|
}
|
||||||
$posYAfterDescription = max($posYAfterDescription,$pdf->GetY());
|
$posYAfterDescription = max($posYAfterDescription, $pdf->GetY());
|
||||||
}
|
}
|
||||||
|
|
||||||
$nexY = max($nexY,$pdf->GetY());
|
$nexY = max($nexY, $pdf->GetY());
|
||||||
$pageposafter = $pdf->getPage();
|
$pageposafter = $pdf->getPage();
|
||||||
$pdf->setPage($pageposbefore);
|
$pdf->setPage($pageposbefore);
|
||||||
$pdf->setTopMargin($this->marge_haute);
|
$pdf->setTopMargin($this->marge_haute);
|
||||||
@ -1164,7 +1164,7 @@ class pdf_testD extends ModelePDFMo
|
|||||||
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R');
|
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R');
|
||||||
}
|
}
|
||||||
|
|
||||||
// product info
|
// product info
|
||||||
$posy += 7;
|
$posy += 7;
|
||||||
$prodToMake = new Product($this->db);
|
$prodToMake = new Product($this->db);
|
||||||
$prodToMake->fetch($object->fk_product);
|
$prodToMake->fetch($object->fk_product);
|
||||||
@ -1183,7 +1183,7 @@ class pdf_testD extends ModelePDFMo
|
|||||||
|
|
||||||
$array = array_filter(array($prodToMake->length, $prodToMake->width, $prodToMake->height));
|
$array = array_filter(array($prodToMake->length, $prodToMake->width, $prodToMake->height));
|
||||||
$dim = implode("x", $array);
|
$dim = implode("x", $array);
|
||||||
if (!empty($dim)){
|
if (!empty($dim)) {
|
||||||
$posy += 5;
|
$posy += 5;
|
||||||
$pdf->SetFont('', 'B', $default_font_size + 3);
|
$pdf->SetFont('', 'B', $default_font_size + 3);
|
||||||
$pdf->SetXY($posx, $posy);
|
$pdf->SetXY($posx, $posy);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user