@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 286 | 286 | // Set path to the background PDF File |
| 287 | 287 | if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 288 | - $pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 288 | + $pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 289 | 289 | $tplidx = $pdf->importPage(1); |
| 290 | 290 | } |
| 291 | 291 | |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | // Pagefoot |
| 795 | 795 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 796 | 796 | if (method_exists($pdf, 'AliasNbPages')) { |
| 797 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 797 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 798 | 798 | } |
| 799 | 799 | |
| 800 | 800 | $pdf->Close(); |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs) |
| 839 | 839 | { |
| 840 | 840 | global $conf, $mysoc; |
| 841 | - '@phan-var-force Commande|Propal|Facture $object'; // availability_code,... does not exist on Facture. |
|
| 841 | + '@phan-var-force Commande|Propal|Facture $object'; // availability_code,... does not exist on Facture. |
|
| 842 | 842 | |
| 843 | 843 | $default_font_size = pdf_getPDFFontSize($outputlangs); |
| 844 | 844 | |
@@ -1433,7 +1433,7 @@ discard block |
||
| 1433 | 1433 | // Show recipient |
| 1434 | 1434 | $widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100; |
| 1435 | 1435 | if ($this->page_largeur < 210) { |
| 1436 | - $widthrecbox = 84; // To work with US executive format |
|
| 1436 | + $widthrecbox = 84; // To work with US executive format |
|
| 1437 | 1437 | } |
| 1438 | 1438 | $posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42; |
| 1439 | 1439 | $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 313 | 313 | // Set path to the background PDF File |
| 314 | 314 | if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 315 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 315 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 316 | 316 | $tplidx = $pdf->importPage(1); |
| 317 | 317 | } |
| 318 | 318 | |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | $pdf->SetDrawColor(128, 128, 128); |
| 322 | 322 | |
| 323 | 323 | if (method_exists($pdf, 'AliasNbPages')) { |
| 324 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 324 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref)); |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | $pdf->MultiCell(0, 3, ''); // Set interline to 3 |
| 348 | 348 | $pdf->SetTextColor(0, 0, 0); |
| 349 | 349 | |
| 350 | - $tab_top = 90; // position of top tab |
|
| 350 | + $tab_top = 90; // position of top tab |
|
| 351 | 351 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
| 352 | 352 | |
| 353 | 353 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | if (!preg_match('/^\w+$/', $newcode) || dol_strlen($newcode) > 32) { |
| 451 | 451 | $newcode = dol_hash($newcode, 'md5'); |
| 452 | 452 | } |
| 453 | - $barcode_path = $conf->barcode->dir_temp . '/barcode_' . $newcode . '_' . $encoding . '.png'; |
|
| 453 | + $barcode_path = $conf->barcode->dir_temp.'/barcode_'.$newcode.'_'.$encoding.'.png'; |
|
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | if ($result > 0) { |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | // Pagefoot |
| 729 | 729 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 730 | 730 | if (method_exists($pdf, 'AliasNbPages')) { |
| 731 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 731 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | $pdf->Close(); |
@@ -1227,7 +1227,7 @@ discard block |
||
| 1227 | 1227 | // Show recipient |
| 1228 | 1228 | $widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100; |
| 1229 | 1229 | if ($this->page_largeur < 210) { |
| 1230 | - $widthrecbox = 84; // To work with US executive format |
|
| 1230 | + $widthrecbox = 84; // To work with US executive format |
|
| 1231 | 1231 | } |
| 1232 | 1232 | $posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42; |
| 1233 | 1233 | $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; |
@@ -355,7 +355,7 @@ |
||
| 355 | 355 | $this->Body($pdf, 1, $lines, $outputlangs); |
| 356 | 356 | |
| 357 | 357 | if (method_exists($pdf, 'AliasNbPages')) { |
| 358 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 358 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | $pdf->Close(); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | if (!empty($conf->mycompany->multidir_output[$object->entity])) { |
| 304 | 304 | $logodir = $conf->mycompany->multidir_output[$object->entity]; |
| 305 | 305 | } |
| 306 | - $pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 306 | + $pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 307 | 307 | $tplidx = $pdf->importPage(1); |
| 308 | 308 | } |
| 309 | 309 | |
@@ -871,7 +871,7 @@ discard block |
||
| 871 | 871 | // Pagefoot |
| 872 | 872 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 873 | 873 | if (method_exists($pdf, 'AliasNbPages')) { |
| 874 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 874 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 875 | 875 | } |
| 876 | 876 | |
| 877 | 877 | //If propal merge product PDF is active |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | if (!empty($conf->mycompany->multidir_output[$object->entity])) { |
| 321 | 321 | $logodir = $conf->mycompany->multidir_output[$object->entity]; |
| 322 | 322 | } |
| 323 | - $pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 323 | + $pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 324 | 324 | $tplidx = $pdf->importPage(1); |
| 325 | 325 | } |
| 326 | 326 | |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | // Pied de page |
| 754 | 754 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 755 | 755 | if (method_exists($pdf, 'AliasNbPages')) { |
| 756 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 756 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 757 | 757 | } |
| 758 | 758 | |
| 759 | 759 | //If propal merge product PDF is active |
@@ -1693,7 +1693,7 @@ discard block |
||
| 1693 | 1693 | |
| 1694 | 1694 | $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs); |
| 1695 | 1695 | |
| 1696 | - $mode = 'target'; |
|
| 1696 | + $mode = 'target'; |
|
| 1697 | 1697 | $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object); |
| 1698 | 1698 | |
| 1699 | 1699 | // Show recipient |
@@ -194,7 +194,7 @@ |
||
| 194 | 194 | $nbpage = $this->_pages($pdf, $outputlangs); // Write content |
| 195 | 195 | |
| 196 | 196 | if (method_exists($pdf, 'AliasNbPages')) { |
| 197 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 197 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 198 | 198 | } |
| 199 | 199 | $pdf->Close(); |
| 200 | 200 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 257 | 257 | // Set path to the background PDF File |
| 258 | 258 | if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 259 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 259 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 260 | 260 | $tplidx = $pdf->importPage(1); |
| 261 | 261 | } |
| 262 | 262 | |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | $pdf->SetDrawColor(128, 128, 128); |
| 266 | 266 | |
| 267 | 267 | if (method_exists($pdf, 'AliasNbPages')) { |
| 268 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 268 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref)); |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | $pdf->MultiCell(0, 3, ''); // Set interline to 3 |
| 292 | 292 | $pdf->SetTextColor(0, 0, 0); |
| 293 | 293 | |
| 294 | - $tab_top = 90; // position of top tab |
|
| 294 | + $tab_top = 90; // position of top tab |
|
| 295 | 295 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 : 10); |
| 296 | 296 | |
| 297 | 297 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | if (!preg_match('/^\w+$/', $newcode) || dol_strlen($newcode) > 32) { |
| 391 | 391 | $newcode = dol_hash($newcode, 'md5'); |
| 392 | 392 | } |
| 393 | - $barcode_path = $conf->barcode->dir_temp . '/barcode_' . $newcode . '_' . $encoding . '.png'; |
|
| 393 | + $barcode_path = $conf->barcode->dir_temp.'/barcode_'.$newcode.'_'.$encoding.'.png'; |
|
| 394 | 394 | } |
| 395 | 395 | |
| 396 | 396 | if ($result > 0) { |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | // Pied de page |
| 643 | 643 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 644 | 644 | if (method_exists($pdf, 'AliasNbPages')) { |
| 645 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 645 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | $pdf->Close(); |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 202 | 202 | // Set path to the background PDF File |
| 203 | 203 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 204 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 204 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 205 | 205 | $tplidx = $pdf->importPage(1); |
| 206 | 206 | } |
| 207 | 207 | |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | |
| 410 | 410 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 411 | 411 | if (method_exists($pdf, 'AliasNbPages')) { |
| 412 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 412 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 413 | 413 | } |
| 414 | 414 | |
| 415 | 415 | $pdf->Close(); |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | $posy += 4; |
| 586 | 586 | $pdf->SetXY($posx, $posy); |
| 587 | 587 | $pdf->SetTextColor(0, 0, 60); |
| 588 | - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer") . " : " . dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R'); |
|
| 588 | + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R'); |
|
| 589 | 589 | } |
| 590 | 590 | |
| 591 | 591 | |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | public $version = 'dolibarr'; |
| 73 | 73 | |
| 74 | - public $posxcomm; // For customer comment column |
|
| 75 | - public $posxweightvol; // For weight or volume |
|
| 74 | + public $posxcomm; // For customer comment column |
|
| 75 | + public $posxweightvol; // For weight or volume |
|
| 76 | 76 | public $posxremainingqty; |
| 77 | 77 | |
| 78 | 78 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | // Define position of columns |
| 117 | 117 | $this->posxdesc = $this->marge_gauche + 1; |
| 118 | - $this->posxcomm = 112; // customer comment |
|
| 118 | + $this->posxcomm = 112; // customer comment |
|
| 119 | 119 | //$this->posxtva=112; |
| 120 | 120 | //$this->posxup=126; |
| 121 | 121 | $this->posxqty = 165; |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
| 213 | 213 | // Set path to the background PDF File |
| 214 | 214 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
| 215 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 215 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
| 216 | 216 | $tplidx = $pdf->importPage(1); |
| 217 | 217 | } |
| 218 | 218 | |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | $this->_pagefoot($pdf, $object, $outputlangs); |
| 491 | 491 | |
| 492 | 492 | if (method_exists($pdf, 'AliasNbPages')) { |
| 493 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 493 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | // Check product remaining to be delivered |