@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $this->option_draft_watermark = 0; // Support add of a watermark on drafts |
81 | 81 | |
82 | 82 | if ($mysoc === null) { |
83 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
83 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
84 | 84 | return; |
85 | 85 | } |
86 | 86 | |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $maxfilesizearray = getMaxFileSizeArray(); |
176 | 176 | $maxmin = $maxfilesizearray['maxmin']; |
177 | 177 | if ($maxmin > 0) { |
178 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
178 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
179 | 179 | } |
180 | 180 | $texte .= ' <input type="file" name="uploadfile">'; |
181 | 181 | $texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
265 | 265 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
266 | 266 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
267 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
267 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
268 | 268 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
269 | 269 | // Get extension (ods or odt) |
270 | 270 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -273,11 +273,11 @@ discard block |
||
273 | 273 | if ($format == '1') { |
274 | 274 | $format = '%Y%m%d%H%M%S'; |
275 | 275 | } |
276 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
276 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
277 | 277 | } else { |
278 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
278 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
279 | 279 | } |
280 | - $file = $dir . '/' . $filename; |
|
280 | + $file = $dir.'/'.$filename; |
|
281 | 281 | //print "newdir=".$dir; |
282 | 282 | //print "newfile=".$newfile; |
283 | 283 | //print "file=".$file; |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | dol_mkdir($conf->reception->dir_temp); |
287 | 287 | if (!is_writable($conf->reception->dir_temp)) { |
288 | 288 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->reception->dir_temp); |
289 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
289 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
290 | 290 | return -1; |
291 | 291 | } |
292 | 292 |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $this->tab_height = 200; //$this->line_height * $this->line_per_page; |
96 | 96 | |
97 | 97 | if ($mysoc === null) { |
98 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
98 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
99 | 99 | return; |
100 | 100 | } |
101 | 101 | // Retrieves issuer |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | // Pied de page |
209 | 209 | $this->_pagefoot($pdf, '', $outputlangs); |
210 | 210 | if (method_exists($pdf, 'AliasNbPages')) { |
211 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
211 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | $pdf->Close(); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $this->atleastonediscount = 0; |
148 | 148 | |
149 | 149 | if ($mysoc === null) { |
150 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
150 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
151 | 151 | return; |
152 | 152 | } |
153 | 153 | |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
288 | 288 | // Set path to the background PDF File |
289 | 289 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
290 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
290 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
291 | 291 | $tplidx = $pdf->importPage(1); |
292 | 292 | } |
293 | 293 | |
@@ -664,7 +664,7 @@ discard block |
||
664 | 664 | // Pied de page |
665 | 665 | $this->_pagefoot($pdf, $object, $outputlangs); |
666 | 666 | if (method_exists($pdf, 'AliasNbPages')) { |
667 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
667 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
668 | 668 | } |
669 | 669 | |
670 | 670 | $pdf->Close(); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $this->option_draft_watermark = 0; // Support add of a watermark on drafts |
85 | 85 | |
86 | 86 | if ($mysoc === null) { |
87 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
87 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
88 | 88 | return; |
89 | 89 | } |
90 | 90 | |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
293 | 293 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
294 | 294 | |
295 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
295 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
296 | 296 | |
297 | 297 | // Get extension (ods or odt) |
298 | 298 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -301,11 +301,11 @@ discard block |
||
301 | 301 | if ($format == '1') { |
302 | 302 | $format = '%Y%m%d%H%M%S'; |
303 | 303 | } |
304 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
304 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
305 | 305 | } else { |
306 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
306 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
307 | 307 | } |
308 | - $file = $dir . '/' . $filename; |
|
308 | + $file = $dir.'/'.$filename; |
|
309 | 309 | //print "newdir=".$dir; |
310 | 310 | //print "newfile=".$newfile; |
311 | 311 | //print "file=".$file; |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | dol_mkdir($conf->supplier_proposal->dir_temp); |
315 | 315 | if (!is_writable($conf->supplier_proposal->dir_temp)) { |
316 | 316 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->supplier_proposal->dir_temp); |
317 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
317 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
318 | 318 | return -1; |
319 | 319 | } |
320 | 320 |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $this->db = $db; |
91 | 91 | $this->name = "zenith"; |
92 | 92 | $this->description = $langs->trans('DocModelZenithDescription'); |
93 | - $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
93 | + $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
94 | 94 | |
95 | 95 | // Page size for A4 format |
96 | 96 | $this->type = 'pdf'; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | $this->atleastonediscount = 0; |
127 | 127 | |
128 | 128 | if ($mysoc === null) { |
129 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
129 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
130 | 130 | return; |
131 | 131 | } |
132 | 132 | |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
285 | 285 | // Set path to the background PDF File |
286 | 286 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
287 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
287 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
288 | 288 | $tplidx = $pdf->importPage(1); |
289 | 289 | } |
290 | 290 | |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | // Pied de page |
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(); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | $this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support during PDF transition: TODO remove this at the end |
103 | 103 | |
104 | 104 | if ($mysoc === null) { |
105 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
105 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
106 | 106 | return; |
107 | 107 | } |
108 | 108 | |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
201 | 201 | // Set path to the background PDF File |
202 | 202 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
203 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
203 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
204 | 204 | $tplidx = $pdf->importPage(1); |
205 | 205 | } |
206 | 206 | |
@@ -307,20 +307,20 @@ discard block |
||
307 | 307 | $nexY = $pdf->GetY(); |
308 | 308 | } |
309 | 309 | if ($object->length) { |
310 | - $texttoshow = $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . ': ' . ($object->length != '' ? $object->length : '?') . ' x ' . ($object->width != '' ? $object->width : '?') . ' x ' . ($object->height != '' ? $object->height : '?'); |
|
311 | - $texttoshow .= ' ' . measuringUnitString(0, "size", $object->length_units); |
|
310 | + $texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?'); |
|
311 | + $texttoshow .= ' '.measuringUnitString(0, "size", $object->length_units); |
|
312 | 312 | $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1); |
313 | 313 | $nexY = $pdf->GetY(); |
314 | 314 | } |
315 | 315 | if ($object->surface) { |
316 | - $texttoshow = $langs->trans("Surface") . ': ' . dol_htmlentitiesbr($object->surface); |
|
317 | - $texttoshow .= ' ' . measuringUnitString(0, "surface", $object->surface_units); |
|
316 | + $texttoshow = $langs->trans("Surface").': '.dol_htmlentitiesbr($object->surface); |
|
317 | + $texttoshow .= ' '.measuringUnitString(0, "surface", $object->surface_units); |
|
318 | 318 | $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1); |
319 | 319 | $nexY = $pdf->GetY(); |
320 | 320 | } |
321 | 321 | if ($object->volume) { |
322 | - $texttoshow = $langs->trans("Volume") . ': ' . dol_htmlentitiesbr($object->volume); |
|
323 | - $texttoshow .= ' ' . measuringUnitString(0, "volume", $object->volume_units); |
|
322 | + $texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume); |
|
323 | + $texttoshow .= ' '.measuringUnitString(0, "volume", $object->volume_units); |
|
324 | 324 | $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1); |
325 | 325 | $nexY = $pdf->GetY(); |
326 | 326 | } |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | // Pied de page |
576 | 576 | $this->_pagefoot($pdf, $object, $outputlangs); |
577 | 577 | if (method_exists($pdf, 'AliasNbPages')) { |
578 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
578 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
579 | 579 | } |
580 | 580 | |
581 | 581 | $pdf->Close(); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $this->option_draft_watermark = 0; // Support add of a watermark on drafts |
84 | 84 | |
85 | 85 | if ($mysoc === null) { |
86 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
86 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
87 | 87 | return; |
88 | 88 | } |
89 | 89 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $maxfilesizearray = getMaxFileSizeArray(); |
177 | 177 | $maxmin = $maxfilesizearray['maxmin']; |
178 | 178 | if ($maxmin > 0) { |
179 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
179 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
180 | 180 | } |
181 | 181 | $texte .= ' <input type="file" name="uploadfile">'; |
182 | 182 | $texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
269 | 269 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
270 | 270 | |
271 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
271 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
272 | 272 | |
273 | 273 | // Get extension (ods or odt) |
274 | 274 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -277,11 +277,11 @@ discard block |
||
277 | 277 | if ($format == '1') { |
278 | 278 | $format = '%Y%m%d%H%M%S'; |
279 | 279 | } |
280 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
280 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
281 | 281 | } else { |
282 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
282 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
283 | 283 | } |
284 | - $file = $dir . '/' . $filename; |
|
284 | + $file = $dir.'/'.$filename; |
|
285 | 285 | //print "newdir=".$dir; |
286 | 286 | //print "newfile=".$newfile; |
287 | 287 | //print "file=".$file; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | dol_mkdir($conf->product->dir_temp); |
291 | 291 | if (!is_writable($conf->product->dir_temp)) { |
292 | 292 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp); |
293 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
293 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
294 | 294 | return -1; |
295 | 295 | } |
296 | 296 |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $this->db = $db; |
98 | 98 | $this->name = "standard"; |
99 | 99 | $this->description = $langs->trans('DocumentModelStandardPDF'); |
100 | - $this->update_main_doc_field = 0; // Save the name of generated file as the main doc when generating a doc with this template |
|
100 | + $this->update_main_doc_field = 0; // Save the name of generated file as the main doc when generating a doc with this template |
|
101 | 101 | |
102 | 102 | // Page size for A4 format |
103 | 103 | $this->type = 'pdf'; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $this->atleastonediscount = 0; |
140 | 140 | |
141 | 141 | if ($mysoc === null) { |
142 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
142 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
143 | 143 | return; |
144 | 144 | } |
145 | 145 | |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
255 | 255 | // Set path to the background PDF File |
256 | 256 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
257 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
257 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
258 | 258 | $tplidx = $pdf->importPage(1); |
259 | 259 | } |
260 | 260 | |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | // Footer page |
457 | 457 | $this->_pagefoot($pdf, $object, $outputlangs); |
458 | 458 | if (method_exists($pdf, 'AliasNbPages')) { |
459 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
459 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
460 | 460 | } |
461 | 461 | |
462 | 462 | $pdf->Close(); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | if ($mysoc === null) { |
130 | - dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR); |
|
130 | + dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR); |
|
131 | 131 | return; |
132 | 132 | } |
133 | 133 | |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
218 | 218 | // Set path to the background PDF File |
219 | 219 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
220 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
220 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
221 | 221 | $tplidx = $pdf->importPage(1); |
222 | 222 | } |
223 | 223 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | $tab_top = 65; |
259 | 259 | |
260 | 260 | $pdf->SetFont('', 'B', $default_font_size); |
261 | - $pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, 0, 12, $tab_top); |
|
261 | + $pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes").":", 0, 'L', 0, 0, 12, $tab_top); |
|
262 | 262 | $tab_top += 4; |
263 | 263 | $pdf->SetFont('', '', $default_font_size - 1); |
264 | 264 | $pdf->writeHTMLCell(190, 3, $this->posxnotes + 1, $tab_top + 1, dol_htmlentitiesbr($object->note_public), 0, 1); |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | // Page footer |
425 | 425 | $this->_pagefoot($pdf, $object, $outputlangs); |
426 | 426 | if (method_exists($pdf, 'AliasNbPages')) { |
427 | - $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
427 | + $pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod |
|
428 | 428 | } |
429 | 429 | |
430 | 430 | $pdf->Close(); |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | // No fill color |
491 | 491 | $pdf->SetFillColor(255, 255, 255); |
492 | 492 | } |
493 | - $result = (($objectligne->required_rank != 0 && $objectligne->rankorder != 0) ? $objectligne->rankorder . "/" . $objectligne->required_rank : "-"); |
|
493 | + $result = (($objectligne->required_rank != 0 && $objectligne->rankorder != 0) ? $objectligne->rankorder."/".$objectligne->required_rank : "-"); |
|
494 | 494 | $pdf->MultiCell($this->posxresult - 210 - 0.8 - 4, 4, $result, 0, 'C', 1); |
495 | 495 | |
496 | 496 | |
@@ -509,7 +509,7 @@ discard block |
||
509 | 509 | $comment = $skill->label; |
510 | 510 | |
511 | 511 | if (!empty($skill->description)) { |
512 | - $comment .= '<br>' . $outputlangs->trans("Description").': '.$skill->description; |
|
512 | + $comment .= '<br>'.$outputlangs->trans("Description").': '.$skill->description; |
|
513 | 513 | } |
514 | 514 | $pdf->writeHTMLCell($this->posxrankemp - $this->posxskill - 0.8, 4, $this->posxskill - 1, $curY, $comment, 0, 1); |
515 | 515 | |
@@ -593,7 +593,7 @@ discard block |
||
593 | 593 | // employee information |
594 | 594 | $employee = new User($this->db); |
595 | 595 | $employee->fetch($object->fk_user); |
596 | - $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities('Employee').' : '.$outputlangs->convToOutputCharset(ucfirst($employee->firstname) . ' ' . strtoupper($employee->lastname)); |
|
596 | + $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities('Employee').' : '.$outputlangs->convToOutputCharset(ucfirst($employee->firstname).' '.strtoupper($employee->lastname)); |
|
597 | 597 | |
598 | 598 | // Position |
599 | 599 | include_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |