@@ -89,7 +89,7 @@ |
||
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'; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $this->db = $db; |
91 | 91 | $this->name = "vinci"; |
92 | 92 | $this->description = $langs->trans('DocumentModelStandardPDF'); |
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'; |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | if ($this->getColumnStatus('desc')) { |
520 | 520 | $pdf->startTransaction(); //description |
521 | 521 | $des = $prod -> description; |
522 | - $descr = $des;//implode("<br>", $des); |
|
522 | + $descr = $des; //implode("<br>", $des); |
|
523 | 523 | |
524 | 524 | $this->printStdColumnContent($pdf, $curY, 'desc', $descr); |
525 | 525 |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance |
185 | 185 | |
186 | 186 | if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) { |
187 | - $this->heightforfooter += 6; |
|
187 | + $this->heightforfooter += 6; |
|
188 | 188 | } |
189 | 189 | $pdf->SetAutoPageBreak(1, 0); |
190 | 190 | |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | $tab_top = 50; |
222 | 222 | $tab_top_newpage = 40; |
223 | 223 | |
224 | - $tab_height = $this->page_hauteur - $tab_top - $this->heightforfooter - $this->heightforfreetext ; |
|
224 | + $tab_height = $this->page_hauteur - $tab_top - $this->heightforfooter - $this->heightforfreetext; |
|
225 | 225 | |
226 | 226 | // Show notes |
227 | 227 | if (!empty($object->note_public)) { |
@@ -334,9 +334,9 @@ discard block |
||
334 | 334 | if (!empty($object->owner_address)) { |
335 | 335 | $address = $object->owner_address; |
336 | 336 | } elseif ($thirdparty->id > 0) { |
337 | - $tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country |
|
337 | + $tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country |
|
338 | 338 | if ($tmpaddresswithoutcountry) { |
339 | - $address = $thirdparty->getFullAddress(1); // full address |
|
339 | + $address = $thirdparty->getFullAddress(1); // full address |
|
340 | 340 | } |
341 | 341 | } |
342 | 342 | $posY = $pdf->GetY(); |
@@ -411,11 +411,11 @@ discard block |
||
411 | 411 | |
412 | 412 | // Show square |
413 | 413 | if ($pagenb == 1) { |
414 | - $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 0, 0); |
|
415 | - $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
414 | + $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 0, 0); |
|
415 | + $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
416 | 416 | } else { |
417 | - $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 1, 0); |
|
418 | - $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
417 | + $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 1, 0); |
|
418 | + $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1; |
|
419 | 419 | } |
420 | 420 | |
421 | 421 | //var_dump($tab_top); |
@@ -520,7 +520,7 @@ |
||
520 | 520 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
521 | 521 | // End add extra fields object |
522 | 522 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
523 | - $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'societe as s'; |
|
523 | + $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'societe as s'; |
|
524 | 524 | if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) { |
525 | 525 | $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; |
526 | 526 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | if ($forlogin) { |
170 | 170 | // Set approval_prompt |
171 | - $approval_prompt = getDolGlobalString('OAUTH_GOOGLE_FORCE_PROMPT_ON_LOGIN', 'auto'); // Can be 'force' |
|
171 | + $approval_prompt = getDolGlobalString('OAUTH_GOOGLE_FORCE_PROMPT_ON_LOGIN', 'auto'); // Can be 'force' |
|
172 | 172 | $apiService->setApprouvalPrompt($approval_prompt); |
173 | 173 | } |
174 | 174 | |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | $storage->clearToken('Google'); |
312 | 312 | |
313 | 313 | $tmpuser = new User($db); |
314 | - $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2. |
|
314 | + $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2. |
|
315 | 315 | |
316 | 316 | if ($res > 0) { |
317 | 317 | $username = $tmpuser->login; |
@@ -336,7 +336,7 @@ |
||
336 | 336 | |
337 | 337 | $multicurrency = new MultiCurrency($this->db); |
338 | 338 | |
339 | - if (! $multicurrency->checkCodeAlreadyExists($conf->currency)) { |
|
339 | + if (!$multicurrency->checkCodeAlreadyExists($conf->currency)) { |
|
340 | 340 | $langs->loadCacheCurrencies(''); |
341 | 341 | |
342 | 342 | $multicurrency->code = $conf->currency; |
@@ -176,7 +176,7 @@ |
||
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="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | $pdf->MultiCell(0, 3, ''); // Set interline to 3 |
293 | 293 | $pdf->SetTextColor(0, 0, 0); |
294 | 294 | |
295 | - $tab_top = 90; // position of top tab |
|
295 | + $tab_top = 90; // position of top tab |
|
296 | 296 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
297 | 297 | |
298 | 298 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |
@@ -873,7 +873,7 @@ discard block |
||
873 | 873 | if ($object->volume_units < 50) { |
874 | 874 | $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs); |
875 | 875 | } else { |
876 | - $totalVolumetoshow = price($object->trueVolume, 0, $outputlangs, 0, 0) . ' ' . measuringUnitString(0, "volume", $object->volume_units); |
|
876 | + $totalVolumetoshow = price($object->trueVolume, 0, $outputlangs, 0, 0) . ' ' . measuringUnitString(0, "volume", $object->volume_units); |
|
877 | 877 | } |
878 | 878 | } |
879 | 879 |
@@ -325,7 +325,7 @@ |
||
325 | 325 | $pdf->MultiCell(0, 3, ''); // Set interline to 3 |
326 | 326 | $pdf->SetTextColor(0, 0, 0); |
327 | 327 | |
328 | - $tab_top = 90; // position of top tab |
|
328 | + $tab_top = 90; // position of top tab |
|
329 | 329 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
330 | 330 | |
331 | 331 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |