@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 256 | 256 | // Set path to the background PDF File |
| 257 | 257 | if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 258 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 258 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 259 | 259 | $tplidx = $pdf->importPage(1); |
| 260 | 260 | } |
| 261 | 261 | |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $pdf->SetDrawColor(128, 128, 128); |
| 265 | 265 | |
| 266 | 266 | if (method_exists($pdf, 'AliasNbPages')) { |
| 267 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 267 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref)); |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | $pdf->MultiCell(0, 3, ''); // Set interline to 3 |
| 291 | 291 | $pdf->SetTextColor(0, 0, 0); |
| 292 | 292 | |
| 293 | - $tab_top = 90; // position of top tab |
|
| 293 | + $tab_top = 90; // position of top tab |
|
| 294 | 294 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
| 295 | 295 | |
| 296 | 296 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | $height_trackingnumber = 4; |
| 337 | 337 | |
| 338 | 338 | $pdf->SetFont('', 'B', $default_font_size - 2); |
| 339 | - $pdf->writeHTMLCell(60, $height_trackingnumber, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber") . " : " . $object->tracking_number, 0, 1, false, true, 'L'); |
|
| 339 | + $pdf->writeHTMLCell(60, $height_trackingnumber, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); |
|
| 340 | 340 | $tab_top_alt = $pdf->GetY(); |
| 341 | 341 | |
| 342 | 342 | $object->getUrlTrackingStatus($object->tracking_number); |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | if (!preg_match('/^\w+$/', $newcode) || dol_strlen($newcode) > 32) { |
| 522 | 522 | $newcode = dol_hash($newcode, 'md5'); |
| 523 | 523 | } |
| 524 | - $barcode_path = $conf->barcode->dir_temp . '/barcode_' . $newcode . '_' . $encoding . '.png'; |
|
| 524 | + $barcode_path = $conf->barcode->dir_temp.'/barcode_'.$newcode.'_'.$encoding.'.png'; |
|
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | if ($result > 0) { |
@@ -770,7 +770,7 @@ discard block |
||
| 770 | 770 | // Pagefoot |
| 771 | 771 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 772 | 772 | if (method_exists($pdf, 'AliasNbPages')) { |
| 773 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 773 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 774 | 774 | } |
| 775 | 775 | |
| 776 | 776 | $pdf->Close(); |
@@ -871,7 +871,7 @@ discard block |
||
| 871 | 871 | if ($object->volume_units < 50) { |
| 872 | 872 | $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs); |
| 873 | 873 | } else { |
| 874 | - $totalVolumetoshow = price($object->trueVolume, 0, $outputlangs, 0, 0).' '.measuringUnitString(0, "volume", $object->volume_units); |
|
| 874 | + $totalVolumetoshow = price($object->trueVolume, 0, $outputlangs, 0, 0).' '.measuringUnitString(0, "volume", $object->volume_units); |
|
| 875 | 875 | } |
| 876 | 876 | } |
| 877 | 877 | |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 252 | 252 | // Set path to the background PDF File |
| 253 | 253 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 254 | - $pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 254 | + $pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 255 | 255 | $tplidx = $pdf->importPage(1); |
| 256 | 256 | } |
| 257 | 257 | |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | // Pagefoot |
| 572 | 572 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 573 | 573 | if (method_exists($pdf, 'AliasNbPages')) { |
| 574 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 574 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 575 | 575 | } |
| 576 | 576 | |
| 577 | 577 | $pdf->Close(); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $this->db = $db; |
| 90 | 90 | $this->name = "zenith"; |
| 91 | 91 | $this->description = $langs->trans('DocModelZenithDescription'); |
| 92 | - $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
| 92 | + $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
| 93 | 93 | |
| 94 | 94 | // Page size for A4 format |
| 95 | 95 | $this->type = 'pdf'; |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 279 | 279 | // Set path to the background PDF File |
| 280 | 280 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 281 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 281 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 282 | 282 | $tplidx = $pdf->importPage(1); |
| 283 | 283 | } |
| 284 | 284 | |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | // Pied de page |
| 789 | 789 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 790 | 790 | if (method_exists($pdf, 'AliasNbPages')) { |
| 791 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 791 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 792 | 792 | } |
| 793 | 793 | |
| 794 | 794 | $pdf->Close(); |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 282 | 282 | // Set path to the background PDF File |
| 283 | 283 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 284 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 284 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 285 | 285 | $tplidx = $pdf->importPage(1); |
| 286 | 286 | } |
| 287 | 287 | |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | // Pied de page |
| 659 | 659 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 660 | 660 | if (method_exists($pdf, 'AliasNbPages')) { |
| 661 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 661 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 | $pdf->Close(); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $this->db = $db; |
| 97 | 97 | $this->name = "standard"; |
| 98 | 98 | $this->description = $langs->trans('DocumentModelStandardPDF'); |
| 99 | - $this->update_main_doc_field = 0; // Save the name of generated file as the main doc when generating a doc with this template |
|
| 99 | + $this->update_main_doc_field = 0; // Save the name of generated file as the main doc when generating a doc with this template |
|
| 100 | 100 | |
| 101 | 101 | // Page size for A4 format |
| 102 | 102 | $this->type = 'pdf'; |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 249 | 249 | // Set path to the background PDF File |
| 250 | 250 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 251 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 251 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 252 | 252 | $tplidx = $pdf->importPage(1); |
| 253 | 253 | } |
| 254 | 254 | |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | // Footer page |
| 451 | 451 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 452 | 452 | if (method_exists($pdf, 'AliasNbPages')) { |
| 453 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 453 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | $pdf->Close(); |
@@ -202,7 +202,7 @@ |
||
| 202 | 202 | // Pied de page |
| 203 | 203 | $this->_pagefoot($pdf, '', $outputlangs); |
| 204 | 204 | if (method_exists($pdf, 'AliasNbPages')) { |
| 205 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 205 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | $pdf->Close(); |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 397 | 397 | // Set path to the background PDF File |
| 398 | 398 | if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 399 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 399 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 400 | 400 | $tplidx = $pdf->importPage(1); |
| 401 | 401 | } |
| 402 | 402 | |
@@ -743,7 +743,7 @@ discard block |
||
| 743 | 743 | // Pied de page |
| 744 | 744 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 745 | 745 | if (method_exists($pdf, 'AliasNbPages')) { |
| 746 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 746 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 747 | 747 | } |
| 748 | 748 | |
| 749 | 749 | $pdf->Close(); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * \brief File of class to generate document from standard template |
| 33 | 33 | */ |
| 34 | 34 | |
| 35 | -require_once DOL_DOCUMENT_ROOT . '/asset/core/modules/asset/modules_asset.php'; |
|
| 35 | +require_once DOL_DOCUMENT_ROOT.'/asset/core/modules/asset/modules_asset.php'; |
|
| 36 | 36 | require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; |
| 37 | 37 | require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; |
| 38 | 38 | require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | // Set path to the background PDF File |
| 233 | 233 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 234 | - $pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 234 | + $pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 235 | 235 | $tplidx = $pdf->importPage(1); |
| 236 | 236 | } |
| 237 | 237 | |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | // Pagefoot |
| 673 | 673 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 674 | 674 | if (method_exists($pdf, 'AliasNbPages')) { |
| 675 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 675 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | $pdf->Close(); |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance |
| 190 | 190 | |
| 191 | 191 | if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) { |
| 192 | - $this->heightforfooter += 6; |
|
| 192 | + $this->heightforfooter += 6; |
|
| 193 | 193 | } |
| 194 | 194 | $pdf->SetAutoPageBreak(1, 0); |
| 195 | 195 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | $tab_top = 50; |
| 227 | 227 | $tab_top_newpage = 40; |
| 228 | 228 | |
| 229 | - $tab_height = $this->page_hauteur - $tab_top - $this->heightforfooter - $this->heightforfreetext ; |
|
| 229 | + $tab_height = $this->page_hauteur - $tab_top - $this->heightforfooter - $this->heightforfreetext; |
|
| 230 | 230 | |
| 231 | 231 | // Show notes |
| 232 | 232 | if (!empty($object->note_public)) { |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | if ($idbankfordirectdebit > 0) { |
| 269 | 269 | $tmpbankfordirectdebit = new Account($this->db); |
| 270 | 270 | $tmpbankfordirectdebit->fetch($idbankfordirectdebit); |
| 271 | - $ics = $tmpbankfordirectdebit->ics; // ICS for direct debit |
|
| 271 | + $ics = $tmpbankfordirectdebit->ics; // ICS for direct debit |
|
| 272 | 272 | } |
| 273 | 273 | if (empty($ics) && getDolGlobalString('PRELEVEMENT_ICS')) { |
| 274 | 274 | $ics = getDolGlobalString('PRELEVEMENT_ICS'); |
@@ -339,9 +339,9 @@ discard block |
||
| 339 | 339 | if (!empty($object->owner_address)) { |
| 340 | 340 | $address = $object->owner_address; |
| 341 | 341 | } elseif ($thirdparty->id > 0) { |
| 342 | - $tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country |
|
| 342 | + $tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country |
|
| 343 | 343 | if ($tmpaddresswithoutcountry) { |
| 344 | - $address = $thirdparty->getFullAddress(1); // full address |
|
| 344 | + $address = $thirdparty->getFullAddress(1); // full address |
|
| 345 | 345 | } |
| 346 | 346 | } |
| 347 | 347 | $posY = $pdf->GetY(); |
@@ -416,11 +416,11 @@ discard block |
||
| 416 | 416 | |
| 417 | 417 | // Show square |
| 418 | 418 | if ($pagenb == 1) { |
| 419 | - $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 0, 0); |
|
| 420 | - $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
| 419 | + $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 0, 0); |
|
| 420 | + $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
| 421 | 421 | } else { |
| 422 | - $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 1, 0); |
|
| 423 | - $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
| 422 | + $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 1, 0); |
|
| 423 | + $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | //var_dump($tab_top); |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | */ |
| 438 | 438 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 439 | 439 | if (method_exists($pdf, 'AliasNbPages')) { |
| 440 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 440 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 441 | 441 | } |
| 442 | 442 | |
| 443 | 443 | $pdf->Close(); |