@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | } |
| 860 | 860 | |
| 861 | 861 | |
| 862 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 862 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 863 | 863 | /** |
| 864 | 864 | * Return list of all available languages |
| 865 | 865 | * |
@@ -871,7 +871,7 @@ discard block |
||
| 871 | 871 | */ |
| 872 | 872 | public function get_available_languages($langdir = DOL_DOCUMENT_ROOT, $maxlength = 0, $usecode = 0, $mainlangonly = 0) |
| 873 | 873 | { |
| 874 | - // phpcs:enable |
|
| 874 | + // phpcs:enable |
|
| 875 | 875 | global $conf; |
| 876 | 876 | |
| 877 | 877 | $this->load("languages"); |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | } |
| 941 | 941 | |
| 942 | 942 | |
| 943 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 943 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 944 | 944 | /** |
| 945 | 945 | * Return if a filename $filename exists for current language (or alternate language) |
| 946 | 946 | * |
@@ -950,7 +950,7 @@ discard block |
||
| 950 | 950 | */ |
| 951 | 951 | public function file_exists($filename, $searchalt = 0) |
| 952 | 952 | { |
| 953 | - // phpcs:enable |
|
| 953 | + // phpcs:enable |
|
| 954 | 954 | // Test si fichier dans repertoire de la langue |
| 955 | 955 | foreach ($this->dir as $searchdir) { |
| 956 | 956 | if (is_readable(dol_osencode($searchdir . "/langs/" . $this->defaultlang . "/" . $filename))) { |
@@ -1188,7 +1188,7 @@ discard block |
||
| 1188 | 1188 | } |
| 1189 | 1189 | } |
| 1190 | 1190 | |
| 1191 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1191 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1192 | 1192 | /** |
| 1193 | 1193 | * Return an array with content of all loaded translation keys (found into this->tab_translate) so |
| 1194 | 1194 | * we get a substitution array we can use for substitutions (for mail or ODT generation for example) |
@@ -1197,7 +1197,7 @@ discard block |
||
| 1197 | 1197 | */ |
| 1198 | 1198 | public function get_translations_for_substitutions() |
| 1199 | 1199 | { |
| 1200 | - // phpcs:enable |
|
| 1200 | + // phpcs:enable |
|
| 1201 | 1201 | $substitutionarray = array(); |
| 1202 | 1202 | |
| 1203 | 1203 | foreach ($this->tab_translate as $code => $label) { |
@@ -320,7 +320,7 @@ |
||
| 320 | 320 | $file_lang_osencoded = dol_osencode($file_lang); |
| 321 | 321 | |
| 322 | 322 | //$filelangexists = is_file($file_lang_osencoded); |
| 323 | - $filelangexists = @is_file($file_lang_osencoded); // avoid [php:warn] |
|
| 323 | + $filelangexists = @is_file($file_lang_osencoded); // avoid [php:warn] |
|
| 324 | 324 | |
| 325 | 325 | //dol_syslog(get_class($this).'::Load Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' file_lang='.$file_lang." => filelangexists=".$filelangexists); |
| 326 | 326 | //print 'Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' this->_tab_loaded[newdomain]='.$this->_tab_loaded[$newdomain].' file_lang='.$file_lang." => filelangexists=".$filelangexists."\n"; |
@@ -1337,7 +1337,7 @@ discard block |
||
| 1337 | 1337 | return '=?' . $conf->file->character_set_client . '?B?' . base64_encode($stringtoencode) . '?='; |
| 1338 | 1338 | } |
| 1339 | 1339 | |
| 1340 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1340 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1341 | 1341 | /** |
| 1342 | 1342 | * Read a file on disk and return encoded content for emails (mode = 'mail') |
| 1343 | 1343 | * |
@@ -1346,7 +1346,7 @@ discard block |
||
| 1346 | 1346 | */ |
| 1347 | 1347 | private function _encode_file($sourcefile) |
| 1348 | 1348 | { |
| 1349 | - // phpcs:enable |
|
| 1349 | + // phpcs:enable |
|
| 1350 | 1350 | $newsourcefile = dol_osencode($sourcefile); |
| 1351 | 1351 | |
| 1352 | 1352 | if (is_readable($newsourcefile)) { |
@@ -1361,7 +1361,7 @@ discard block |
||
| 1361 | 1361 | } |
| 1362 | 1362 | |
| 1363 | 1363 | |
| 1364 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1364 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1365 | 1365 | /** |
| 1366 | 1366 | * Write content of a SMTP request into a dump file (mode = all) |
| 1367 | 1367 | * Used for debugging. |
@@ -1371,7 +1371,7 @@ discard block |
||
| 1371 | 1371 | */ |
| 1372 | 1372 | public function dump_mail() |
| 1373 | 1373 | { |
| 1374 | - // phpcs:enable |
|
| 1374 | + // phpcs:enable |
|
| 1375 | 1375 | global $dolibarr_main_data_root; |
| 1376 | 1376 | |
| 1377 | 1377 | if (@is_writable($dolibarr_main_data_root)) { // Avoid fatal error on fopen with open_basedir |
@@ -1402,7 +1402,7 @@ discard block |
||
| 1402 | 1402 | } |
| 1403 | 1403 | } |
| 1404 | 1404 | |
| 1405 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1405 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1406 | 1406 | /** |
| 1407 | 1407 | * Save content if mail is in error |
| 1408 | 1408 | * Used for debugging. |
@@ -1499,7 +1499,7 @@ discard block |
||
| 1499 | 1499 | } |
| 1500 | 1500 | |
| 1501 | 1501 | |
| 1502 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1502 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1503 | 1503 | /** |
| 1504 | 1504 | * Create SMTP headers (mode = 'mail') |
| 1505 | 1505 | * |
@@ -1507,7 +1507,7 @@ discard block |
||
| 1507 | 1507 | */ |
| 1508 | 1508 | public function write_smtpheaders() |
| 1509 | 1509 | { |
| 1510 | - // phpcs:enable |
|
| 1510 | + // phpcs:enable |
|
| 1511 | 1511 | $out = ""; |
| 1512 | 1512 | $host = dol_getprefix('email'); |
| 1513 | 1513 | |
@@ -1571,7 +1571,7 @@ discard block |
||
| 1571 | 1571 | } |
| 1572 | 1572 | |
| 1573 | 1573 | |
| 1574 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1574 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1575 | 1575 | /** |
| 1576 | 1576 | * Create header MIME (mode = 'mail') |
| 1577 | 1577 | * |
@@ -1581,7 +1581,7 @@ discard block |
||
| 1581 | 1581 | */ |
| 1582 | 1582 | public function write_mimeheaders($filename_list, $mimefilename_list) |
| 1583 | 1583 | { |
| 1584 | - // phpcs:enable |
|
| 1584 | + // phpcs:enable |
|
| 1585 | 1585 | $mimedone = 0; |
| 1586 | 1586 | $out = ""; |
| 1587 | 1587 | |
@@ -1601,7 +1601,7 @@ discard block |
||
| 1601 | 1601 | return $out; |
| 1602 | 1602 | } |
| 1603 | 1603 | |
| 1604 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1604 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1605 | 1605 | /** |
| 1606 | 1606 | * Return email content (mode = 'mail') |
| 1607 | 1607 | * |
@@ -1610,7 +1610,7 @@ discard block |
||
| 1610 | 1610 | */ |
| 1611 | 1611 | public function write_body($msgtext) |
| 1612 | 1612 | { |
| 1613 | - // phpcs:enable |
|
| 1613 | + // phpcs:enable |
|
| 1614 | 1614 | global $conf; |
| 1615 | 1615 | |
| 1616 | 1616 | $out = ''; |
@@ -1694,7 +1694,7 @@ discard block |
||
| 1694 | 1694 | return $out; |
| 1695 | 1695 | } |
| 1696 | 1696 | |
| 1697 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1697 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1698 | 1698 | /** |
| 1699 | 1699 | * Attach file to email (mode = 'mail') |
| 1700 | 1700 | * |
@@ -1706,7 +1706,7 @@ discard block |
||
| 1706 | 1706 | */ |
| 1707 | 1707 | private function write_files($filename_list, $mimetype_list, $mimefilename_list, $cidlist) |
| 1708 | 1708 | { |
| 1709 | - // phpcs:enable |
|
| 1709 | + // phpcs:enable |
|
| 1710 | 1710 | $out = ''; |
| 1711 | 1711 | |
| 1712 | 1712 | $filename_list_size = count($filename_list); |
@@ -1745,7 +1745,7 @@ discard block |
||
| 1745 | 1745 | } |
| 1746 | 1746 | |
| 1747 | 1747 | |
| 1748 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1748 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1749 | 1749 | /** |
| 1750 | 1750 | * Attach an image to email (mode = 'mail') |
| 1751 | 1751 | * |
@@ -1754,7 +1754,7 @@ discard block |
||
| 1754 | 1754 | */ |
| 1755 | 1755 | public function write_images($images_list) |
| 1756 | 1756 | { |
| 1757 | - // phpcs:enable |
|
| 1757 | + // phpcs:enable |
|
| 1758 | 1758 | $out = ''; |
| 1759 | 1759 | |
| 1760 | 1760 | if (is_array($images_list)) { |
@@ -1776,7 +1776,7 @@ discard block |
||
| 1776 | 1776 | } |
| 1777 | 1777 | |
| 1778 | 1778 | |
| 1779 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1779 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1780 | 1780 | /** |
| 1781 | 1781 | * Try to create a socket connection |
| 1782 | 1782 | * |
@@ -1786,7 +1786,7 @@ discard block |
||
| 1786 | 1786 | */ |
| 1787 | 1787 | public function check_server_port($host, $port) |
| 1788 | 1788 | { |
| 1789 | - // phpcs:enable |
|
| 1789 | + // phpcs:enable |
|
| 1790 | 1790 | global $conf; |
| 1791 | 1791 | |
| 1792 | 1792 | $_retVal = 0; |
@@ -1857,7 +1857,7 @@ discard block |
||
| 1857 | 1857 | return $_retVal; |
| 1858 | 1858 | } |
| 1859 | 1859 | |
| 1860 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1860 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1861 | 1861 | /** |
| 1862 | 1862 | * This function has been modified as provided by SirSir to allow multiline responses when |
| 1863 | 1863 | * using SMTP Extensions. |
@@ -1868,7 +1868,7 @@ discard block |
||
| 1868 | 1868 | */ |
| 1869 | 1869 | public function server_parse($socket, $response) |
| 1870 | 1870 | { |
| 1871 | - // phpcs:enable |
|
| 1871 | + // phpcs:enable |
|
| 1872 | 1872 | $_retVal = true; // Indicates if Object was created or not |
| 1873 | 1873 | $server_response = ''; |
| 1874 | 1874 | |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | if ($emailtoadd && preg_match('/' . preg_quote($emailtoadd, '/') . '/i', $to)) { |
| 353 | - $emailtoadd = ''; // Email already in the "To" |
|
| 353 | + $emailtoadd = ''; // Email already in the "To" |
|
| 354 | 354 | } |
| 355 | 355 | if ($emailtoadd) { |
| 356 | 356 | $listofemailstoadd[$key] = $emailtoadd; |
@@ -1107,8 +1107,8 @@ discard block |
||
| 1107 | 1107 | } |
| 1108 | 1108 | |
| 1109 | 1109 | $smtperrorcode = 0; |
| 1110 | - if (! $result) { |
|
| 1111 | - $smtperrorcode = $this->smtps->lastretval; // SMTP error code |
|
| 1110 | + if (!$result) { |
|
| 1111 | + $smtperrorcode = $this->smtps->lastretval; // SMTP error code |
|
| 1112 | 1112 | dol_syslog("CMailFile::sendfile: mail SMTP error code " . $smtperrorcode, LOG_WARNING); |
| 1113 | 1113 | |
| 1114 | 1114 | if ($smtperrorcode == '421') { // Try later |
@@ -1126,10 +1126,10 @@ discard block |
||
| 1126 | 1126 | } |
| 1127 | 1127 | } |
| 1128 | 1128 | |
| 1129 | - $result = $this->smtps->getErrors(); // applicative error code (not SMTP error code) |
|
| 1129 | + $result = $this->smtps->getErrors(); // applicative error code (not SMTP error code) |
|
| 1130 | 1130 | if (empty($this->error) && empty($result)) { |
| 1131 | 1131 | dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG); |
| 1132 | - $res = true; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1132 | + $res = true; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1133 | 1133 | } else { |
| 1134 | 1134 | if (empty($this->error)) { |
| 1135 | 1135 | $this->error = $result; |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | |
| 1377 | 1377 | if (@is_writable($dolibarr_main_data_root)) { // Avoid fatal error on fopen with open_basedir |
| 1378 | 1378 | $outputfile = $dolibarr_main_data_root . "/dolibarr_mail.log"; |
| 1379 | - $fp = fopen($outputfile, "w"); // overwrite |
|
| 1379 | + $fp = fopen($outputfile, "w"); // overwrite |
|
| 1380 | 1380 | |
| 1381 | 1381 | if ($this->sendmode == 'mail') { |
| 1382 | 1382 | fwrite($fp, $this->headers); |
@@ -1634,7 +1634,7 @@ discard block |
||
| 1634 | 1634 | // Similar code to forge a text from html is also in smtps.class.php |
| 1635 | 1635 | $strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent); |
| 1636 | 1636 | // TODO We could replace <img ...> with [Filename.ext] like Gmail do. |
| 1637 | - $strContentAltText = html_entity_decode(strip_tags($strContentAltText)); // Remove any HTML tags |
|
| 1637 | + $strContentAltText = html_entity_decode(strip_tags($strContentAltText)); // Remove any HTML tags |
|
| 1638 | 1638 | $strContentAltText = trim(wordwrap($strContentAltText, 75, !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA') ? "\r\n" : "\n")); |
| 1639 | 1639 | |
| 1640 | 1640 | // Check if html header already in message, if not complete the message |
@@ -2019,7 +2019,7 @@ discard block |
||
| 2019 | 2019 | // We save the image to send in disk |
| 2020 | 2020 | $filecontent = $matches[2][$key]; |
| 2021 | 2021 | |
| 2022 | - $cid = 'cid000' . dol_hash($filecontent, 'md5'); // The id must not change if image is same |
|
| 2022 | + $cid = 'cid000' . dol_hash($filecontent, 'md5'); // The id must not change if image is same |
|
| 2023 | 2023 | |
| 2024 | 2024 | $destfiletmp = $images_dir . '/' . $cid . '.' . $ext; |
| 2025 | 2025 | |
@@ -1251,7 +1251,7 @@ discard block |
||
| 1251 | 1251 | print ajax_combobox('select' . $htmlname); |
| 1252 | 1252 | } |
| 1253 | 1253 | |
| 1254 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1254 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1255 | 1255 | /** |
| 1256 | 1256 | * Clear list of attached files in send mail form (also stored in session) |
| 1257 | 1257 | * |
@@ -1259,7 +1259,7 @@ discard block |
||
| 1259 | 1259 | */ |
| 1260 | 1260 | public function clear_attached_files() |
| 1261 | 1261 | { |
| 1262 | - // phpcs:enable |
|
| 1262 | + // phpcs:enable |
|
| 1263 | 1263 | global $conf, $user; |
| 1264 | 1264 | require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; |
| 1265 | 1265 | |
@@ -83,17 +83,17 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | public $backtopage; |
| 85 | 85 | |
| 86 | - public $ispublic; // to show information or not into public form |
|
| 86 | + public $ispublic; // to show information or not into public form |
|
| 87 | 87 | |
| 88 | 88 | public $withtitletopic; |
| 89 | 89 | public $withtopicreadonly; |
| 90 | 90 | public $withreadid; |
| 91 | 91 | |
| 92 | - public $withcompany; // to show company drop-down list |
|
| 92 | + public $withcompany; // to show company drop-down list |
|
| 93 | 93 | public $withfromsocid; |
| 94 | 94 | public $withfromcontactid; |
| 95 | 95 | public $withnotifytiersatcreate; |
| 96 | - public $withusercreate; // to show name of creating user in form |
|
| 96 | + public $withusercreate; // to show name of creating user in form |
|
| 97 | 97 | public $withcreatereadonly; |
| 98 | 98 | |
| 99 | 99 | /** |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | public $withextrafields; |
| 103 | 103 | |
| 104 | - public $withref; // to show ref field |
|
| 104 | + public $withref; // to show ref field |
|
| 105 | 105 | public $withcancel; |
| 106 | 106 | |
| 107 | 107 | public $type_code; |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $this->withcreatereadonly = 1; |
| 147 | 147 | $this->withemail = 0; |
| 148 | 148 | $this->withref = 0; |
| 149 | - $this->withextrafields = 0; // to show extrafields or not |
|
| 149 | + $this->withextrafields = 0; // to show extrafields or not |
|
| 150 | 150 | //$this->withtopicreadonly=0; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | $maxfilesizearray = getMaxFileSizeArray(); |
| 520 | 520 | $maxmin = $maxfilesizearray['maxmin']; |
| 521 | 521 | if ($maxmin > 0) { |
| 522 | - $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 522 | + $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 523 | 523 | } |
| 524 | 524 | $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />'; |
| 525 | 525 | $out .= ' '; |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | $publicgroups = ($filtertype == 'public=1' || $filtertype == '(public:=:1)'); |
| 825 | 825 | |
| 826 | 826 | $ticketstat = new Ticket($this->db); |
| 827 | - $ticketstat->loadCacheCategoriesTickets($publicgroups ? 1 : -1); // get list of active ticket groups |
|
| 827 | + $ticketstat->loadCacheCategoriesTickets($publicgroups ? 1 : -1); // get list of active ticket groups |
|
| 828 | 828 | |
| 829 | 829 | if ($use_multilevel <= 0) { |
| 830 | 830 | print '<select id="select' . $htmlname . '" class="flat minwidth100' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">'; |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | } |
| 997 | 997 | $stringtoprint .= '</select> '; |
| 998 | 998 | |
| 999 | - $levelid = 1; // The first combobox |
|
| 999 | + $levelid = 1; // The first combobox |
|
| 1000 | 1000 | while ($levelid <= $use_multilevel) { // Loop to take the child of the combo |
| 1001 | 1001 | $tabscript = array(); |
| 1002 | 1002 | $stringtoprint .= '<select id="' . $htmlname . '_child_' . $levelid . '" class="maxwidth500 minwidth400 groupticketchild" child_id="' . $levelid . '">'; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 53 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 54 | 54 | /** |
| 55 | 55 | * Show a combo list with contracts qualified for a third party |
| 56 | 56 | * |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function select_contract($socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0, $morecss = 'minwidth150') |
| 68 | 68 | { |
| 69 | - // phpcs:enable |
|
| 69 | + // phpcs:enable |
|
| 70 | 70 | global $user, $conf, $langs; |
| 71 | 71 | |
| 72 | 72 | $hideunselectables = false; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $this->db = $db; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 55 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 56 | 56 | /** |
| 57 | 57 | * Return html select list with available languages (key='en_US', value='United States' for example) |
| 58 | 58 | * |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = array(), $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0, $multiselect = 0, $onlykeys = array(), $mainlangonly = 0) |
| 75 | 75 | { |
| 76 | - // phpcs:enable |
|
| 76 | + // phpcs:enable |
|
| 77 | 77 | global $conf, $langs; |
| 78 | 78 | |
| 79 | 79 | if (getDolGlobalString('MAIN_DEFAULT_LANGUAGE_FILTER')) { |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | return $out; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 181 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 182 | 182 | /** |
| 183 | 183 | * Return list of available menus (eldy_backoffice, ...) |
| 184 | 184 | * |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | */ |
| 191 | 191 | public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '') |
| 192 | 192 | { |
| 193 | - // phpcs:enable |
|
| 193 | + // phpcs:enable |
|
| 194 | 194 | global $langs, $conf; |
| 195 | 195 | |
| 196 | 196 | // Clean parameters |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | return; |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 289 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 290 | 290 | /** |
| 291 | 291 | * Return combo list of available menu families |
| 292 | 292 | * |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | */ |
| 298 | 298 | public function select_menu_families($selected, $htmlname, $dirmenuarray) |
| 299 | 299 | { |
| 300 | - // phpcs:enable |
|
| 300 | + // phpcs:enable |
|
| 301 | 301 | global $langs, $conf; |
| 302 | 302 | |
| 303 | 303 | //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php'); // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | |
| 369 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 369 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 370 | 370 | /** |
| 371 | 371 | * Return a HTML select list of timezones |
| 372 | 372 | * |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | */ |
| 377 | 377 | public function select_timezone($selected, $htmlname) |
| 378 | 378 | { |
| 379 | - // phpcs:enable |
|
| 379 | + // phpcs:enable |
|
| 380 | 380 | print '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '">'; |
| 381 | 381 | print '<option value="-1"> </option>'; |
| 382 | 382 | |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | |
| 420 | 420 | |
| 421 | 421 | |
| 422 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 422 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 423 | 423 | /** |
| 424 | 424 | * Return html select list with available languages (key='en_US', value='United States' for example) |
| 425 | 425 | * |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | */ |
| 433 | 433 | public function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = '', $showempty = 0, $forcecombo = 0) |
| 434 | 434 | { |
| 435 | - // phpcs:enable |
|
| 435 | + // phpcs:enable |
|
| 436 | 436 | global $langs; |
| 437 | 437 | |
| 438 | 438 | $langs->load("dict"); |
@@ -129,7 +129,7 @@ |
||
| 129 | 129 | $out .= '>' . $langs->trans("AutoDetectLang") . '</option>'; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - asort($langs_available); // array('XX' => 'Language (Country)', ...) |
|
| 132 | + asort($langs_available); // array('XX' => 'Language (Country)', ...) |
|
| 133 | 133 | |
| 134 | 134 | foreach ($langs_available as $key => $value) { |
| 135 | 135 | $valuetoshow = $value; |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | } |
| 537 | 537 | |
| 538 | 538 | |
| 539 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 539 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 540 | 540 | /** |
| 541 | 541 | * Return if an invoice can be deleted |
| 542 | 542 | * Rule is: |
@@ -552,7 +552,7 @@ discard block |
||
| 552 | 552 | */ |
| 553 | 553 | public function is_erasable() |
| 554 | 554 | { |
| 555 | - // phpcs:enable |
|
| 555 | + // phpcs:enable |
|
| 556 | 556 | |
| 557 | 557 | // We check if invoice is a temporary number (PROVxxxx) |
| 558 | 558 | $tmppart = substr($this->ref, 1, 4); |
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type); |
| 779 | 779 | } |
| 780 | 780 | |
| 781 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 781 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 782 | 782 | /** |
| 783 | 783 | * Return label of a status |
| 784 | 784 | * |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | */ |
| 792 | 792 | public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = -1) |
| 793 | 793 | { |
| 794 | - // phpcs:enable |
|
| 794 | + // phpcs:enable |
|
| 795 | 795 | global $langs, $hookmanager; |
| 796 | 796 | $langs->load('bills'); |
| 797 | 797 | |
@@ -861,7 +861,7 @@ discard block |
||
| 861 | 861 | return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode); |
| 862 | 862 | } |
| 863 | 863 | |
| 864 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 864 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 865 | 865 | /** |
| 866 | 866 | * Returns an invoice payment deadline based on the invoice settlement |
| 867 | 867 | * conditions and billing date. |
@@ -871,7 +871,7 @@ discard block |
||
| 871 | 871 | */ |
| 872 | 872 | public function calculate_date_lim_reglement($cond_reglement = 0) |
| 873 | 873 | { |
| 874 | - // phpcs:enable |
|
| 874 | + // phpcs:enable |
|
| 875 | 875 | if (!$cond_reglement) { |
| 876 | 876 | $cond_reglement = $this->cond_reglement_code; |
| 877 | 877 | } |
@@ -957,7 +957,7 @@ discard block |
||
| 957 | 957 | return $datelim; |
| 958 | 958 | } |
| 959 | 959 | |
| 960 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 960 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 961 | 961 | /** |
| 962 | 962 | * Create a withdrawal request for a direct debit order or a credit transfer order. |
| 963 | 963 | * Use the remain to pay excluding all existing open direct debit requests. |
@@ -971,7 +971,7 @@ discard block |
||
| 971 | 971 | */ |
| 972 | 972 | public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'facture', $checkduplicateamongall = 0) |
| 973 | 973 | { |
| 974 | - // phpcs:enable |
|
| 974 | + // phpcs:enable |
|
| 975 | 975 | global $conf; |
| 976 | 976 | |
| 977 | 977 | $error = 0; |
@@ -1624,7 +1624,7 @@ discard block |
||
| 1624 | 1624 | } |
| 1625 | 1625 | } |
| 1626 | 1626 | |
| 1627 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1627 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1628 | 1628 | /** |
| 1629 | 1629 | * Remove a direct debit request or a credit transfer request |
| 1630 | 1630 | * |
@@ -1634,7 +1634,7 @@ discard block |
||
| 1634 | 1634 | */ |
| 1635 | 1635 | public function demande_prelevement_delete($fuser, $did) |
| 1636 | 1636 | { |
| 1637 | - // phpcs:enable |
|
| 1637 | + // phpcs:enable |
|
| 1638 | 1638 | $sql = 'DELETE FROM ' . $this->db->prefix() . 'prelevement_demande'; |
| 1639 | 1639 | $sql .= ' WHERE rowid = ' . ((int) $did); |
| 1640 | 1640 | $sql .= ' AND traite = 0'; |
@@ -95,9 +95,9 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public $revenuestamp; |
| 97 | 97 | |
| 98 | - public $totalpaid; // duplicate with sumpayed |
|
| 99 | - public $totaldeposits; // duplicate with sumdeposit |
|
| 100 | - public $totalcreditnotes; // duplicate with sumcreditnote |
|
| 98 | + public $totalpaid; // duplicate with sumpayed |
|
| 99 | + public $totaldeposits; // duplicate with sumdeposit |
|
| 100 | + public $totalcreditnotes; // duplicate with sumcreditnote |
|
| 101 | 101 | |
| 102 | 102 | public $sumpayed; |
| 103 | 103 | public $sumpayed_multicurrency; |
@@ -1134,7 +1134,7 @@ discard block |
||
| 1134 | 1134 | if ($this->status > self::STATUS_DRAFT && $this->paye == 0) { |
| 1135 | 1135 | // Get the default payment mode for BAN payment of the third party |
| 1136 | 1136 | require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php'; |
| 1137 | - $bac = new CompanyBankAccount($this->db); // table societe_rib |
|
| 1137 | + $bac = new CompanyBankAccount($this->db); // table societe_rib |
|
| 1138 | 1138 | $result = $bac->fetch(0, $this->socid, 1, 'ban'); |
| 1139 | 1139 | if ($result <= 0 || empty($bac->id)) { |
| 1140 | 1140 | $this->error = $langs->trans("ThirdpartyHasNoDefaultBanAccount"); |
@@ -1148,16 +1148,16 @@ discard block |
||
| 1148 | 1148 | $sql .= " FROM " . $this->db->prefix() . "prelevement_demande"; |
| 1149 | 1149 | $sql .= " WHERE rowid = " . ((int) $did); |
| 1150 | 1150 | if ($type != 'bank-transfer' && $type != 'credit-transfer') { |
| 1151 | - $sql .= " AND fk_facture = " . ((int) $this->id); // Add a protection to not pay another invoice than current one |
|
| 1151 | + $sql .= " AND fk_facture = " . ((int) $this->id); // Add a protection to not pay another invoice than current one |
|
| 1152 | 1152 | } |
| 1153 | 1153 | if ($type != 'direct-debit') { |
| 1154 | 1154 | if ($sourcetype == 'salary') { |
| 1155 | - $sql .= " AND fk_salary = " . ((int) $this->id); // Add a protection to not pay another salary than current one |
|
| 1155 | + $sql .= " AND fk_salary = " . ((int) $this->id); // Add a protection to not pay another salary than current one |
|
| 1156 | 1156 | } else { |
| 1157 | - $sql .= " AND fk_facture_fourn = " . ((int) $this->id); // Add a protection to not pay another invoice than current one |
|
| 1157 | + $sql .= " AND fk_facture_fourn = " . ((int) $this->id); // Add a protection to not pay another invoice than current one |
|
| 1158 | 1158 | } |
| 1159 | 1159 | } |
| 1160 | - $sql .= " AND traite = 0"; // To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0) |
|
| 1160 | + $sql .= " AND traite = 0"; // To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0) |
|
| 1161 | 1161 | |
| 1162 | 1162 | dol_syslog(get_class($this) . "::makeStripeSepaRequest load requests to process", LOG_DEBUG); |
| 1163 | 1163 | $resql = $this->db->query($sql); |
@@ -1173,7 +1173,7 @@ discard block |
||
| 1173 | 1173 | |
| 1174 | 1174 | if (is_numeric($amount) && $amount != 0) { |
| 1175 | 1175 | require_once DOL_DOCUMENT_ROOT . '/societe/class/companypaymentmode.class.php'; |
| 1176 | - $companypaymentmode = new CompanyPaymentMode($this->db); // table societe_rib |
|
| 1176 | + $companypaymentmode = new CompanyPaymentMode($this->db); // table societe_rib |
|
| 1177 | 1177 | $companypaymentmode->fetch($bac->id); |
| 1178 | 1178 | |
| 1179 | 1179 | $this->stripechargedone = 0; |
@@ -1183,7 +1183,7 @@ discard block |
||
| 1183 | 1183 | |
| 1184 | 1184 | $currency = $conf->currency; |
| 1185 | 1185 | |
| 1186 | - $errorforinvoice = 0; // We reset the $errorforinvoice at each invoice loop |
|
| 1186 | + $errorforinvoice = 0; // We reset the $errorforinvoice at each invoice loop |
|
| 1187 | 1187 | |
| 1188 | 1188 | $this->fetch_thirdparty(); |
| 1189 | 1189 | |
@@ -1202,7 +1202,7 @@ discard block |
||
| 1202 | 1202 | $amountstripe = $amountstripe * 100; |
| 1203 | 1203 | } |
| 1204 | 1204 | |
| 1205 | - $fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'); // Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr. |
|
| 1205 | + $fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'); // Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr. |
|
| 1206 | 1206 | if (!($fk_bank_account > 0)) { |
| 1207 | 1207 | $error++; |
| 1208 | 1208 | $errorforinvoice++; |
@@ -1263,7 +1263,7 @@ discard block |
||
| 1263 | 1263 | $thirdparty = new Societe($this->db); |
| 1264 | 1264 | $resultthirdparty = $thirdparty->fetch($this->socid); |
| 1265 | 1265 | |
| 1266 | - include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This include the include of htdocs/stripe/config.php |
|
| 1266 | + include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This include the include of htdocs/stripe/config.php |
|
| 1267 | 1267 | // So it inits or erases the $stripearrayofkeysbyenv |
| 1268 | 1268 | $stripe = new Stripe($this->db); |
| 1269 | 1269 | |
@@ -1276,26 +1276,26 @@ discard block |
||
| 1276 | 1276 | $foundalternativestripeaccount = ''; |
| 1277 | 1277 | |
| 1278 | 1278 | // Force stripe to another value (by default this value is empty) |
| 1279 | - if (! empty($forcestripe)) { |
|
| 1279 | + if (!empty($forcestripe)) { |
|
| 1280 | 1280 | dol_syslog("makeStripeSepaRequest A dedicated stripe account was forced, so we switch to it."); |
| 1281 | 1281 | |
| 1282 | 1282 | $tmparray = explode('@', $forcestripe); |
| 1283 | - if (! empty($tmparray[1])) { |
|
| 1283 | + if (!empty($tmparray[1])) { |
|
| 1284 | 1284 | $tmparray2 = explode(':', $tmparray[1]); |
| 1285 | - if (! empty($tmparray2[1])) { |
|
| 1285 | + if (!empty($tmparray2[1])) { |
|
| 1286 | 1286 | $stripearrayofkeysbyenv[$servicestatus]["publishable_key"] = $tmparray2[0]; |
| 1287 | 1287 | $stripearrayofkeysbyenv[$servicestatus]["secret_key"] = $tmparray2[1]; |
| 1288 | 1288 | |
| 1289 | 1289 | $stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus]; |
| 1290 | 1290 | \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']); |
| 1291 | 1291 | |
| 1292 | - $foundalternativestripeaccount = $tmparray[0]; // Store the customer id |
|
| 1292 | + $foundalternativestripeaccount = $tmparray[0]; // Store the customer id |
|
| 1293 | 1293 | |
| 1294 | 1294 | dol_syslog("makeStripeSepaRequest We use now customer=" . $foundalternativestripeaccount . " publishable_key=" . $stripearrayofkeys['publishable_key'], LOG_DEBUG); |
| 1295 | 1295 | } |
| 1296 | 1296 | } |
| 1297 | 1297 | |
| 1298 | - if (! $foundalternativestripeaccount) { |
|
| 1298 | + if (!$foundalternativestripeaccount) { |
|
| 1299 | 1299 | $stripearrayofkeysbyenv = $savstripearrayofkeysbyenv; |
| 1300 | 1300 | |
| 1301 | 1301 | $stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus]; |
@@ -1310,7 +1310,7 @@ discard block |
||
| 1310 | 1310 | dol_syslog("makeStripeSepaRequest No dedicated Stripe Account requested, so we use global one, so " . $stripearrayofkeys['publishable_key'], LOG_DEBUG); |
| 1311 | 1311 | } |
| 1312 | 1312 | |
| 1313 | - $stripeacc = $stripe->getStripeAccount($service, $this->socid); // Get Stripe OAuth connect account if it exists (no network access here) |
|
| 1313 | + $stripeacc = $stripe->getStripeAccount($service, $this->socid); // Get Stripe OAuth connect account if it exists (no network access here) |
|
| 1314 | 1314 | |
| 1315 | 1315 | if ($foundalternativestripeaccount) { |
| 1316 | 1316 | if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | } |
| 1321 | 1321 | } else { |
| 1322 | 1322 | $customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0); |
| 1323 | - if (empty($customer) && ! empty($stripe->error)) { |
|
| 1323 | + if (empty($customer) && !empty($stripe->error)) { |
|
| 1324 | 1324 | $this->errors[] = $stripe->error; |
| 1325 | 1325 | } |
| 1326 | 1326 | /*if (!empty($customer) && empty($customer->sources)) { |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | $charge->failure_message = $stripe->error; |
| 1377 | 1377 | $charge->failure_declinecode = $stripe->declinecode; |
| 1378 | 1378 | $stripefailurecode = $stripe->code; |
| 1379 | - $stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL; |
|
| 1379 | + $stripefailuremessage = 'Action required. Contact the support at '; // . $conf->global->SELLYOURSAAS_MAIN_EMAIL; |
|
| 1380 | 1380 | $stripefailuredeclinecode = $stripe->declinecode; |
| 1381 | 1381 | } else { |
| 1382 | 1382 | dol_syslog(var_export($paymentintent, true), LOG_DEBUG); |
@@ -1502,7 +1502,7 @@ discard block |
||
| 1502 | 1502 | $description = 'Failed to find or use your payment mode (no payment mode for this customer id)'; |
| 1503 | 1503 | $stripefailurecode = 'BADPAYMENTMODE'; |
| 1504 | 1504 | $stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)'; |
| 1505 | - $postactionmessages = []; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1505 | + $postactionmessages = []; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1506 | 1506 | |
| 1507 | 1507 | $object = $this; |
| 1508 | 1508 | |
@@ -1517,18 +1517,18 @@ discard block |
||
| 1517 | 1517 | // Insert record of payment (success or error) |
| 1518 | 1518 | $actioncomm = new ActionComm($this->db); |
| 1519 | 1519 | |
| 1520 | - $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
|
| 1520 | + $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
|
| 1521 | 1521 | $actioncomm->code = 'AC_' . $actioncode; |
| 1522 | 1522 | $actioncomm->label = $description; |
| 1523 | 1523 | $actioncomm->note_private = implode(",\n", $postactionmessages); |
| 1524 | 1524 | $actioncomm->fk_project = $this->fk_project; |
| 1525 | 1525 | $actioncomm->datep = $now; |
| 1526 | 1526 | $actioncomm->datef = $now; |
| 1527 | - $actioncomm->percentage = -1; // Not applicable |
|
| 1527 | + $actioncomm->percentage = -1; // Not applicable |
|
| 1528 | 1528 | $actioncomm->socid = $thirdparty->id; |
| 1529 | 1529 | $actioncomm->contactid = 0; |
| 1530 | - $actioncomm->authorid = $user->id; // User saving action |
|
| 1531 | - $actioncomm->userownerid = $user->id; // Owner of action |
|
| 1530 | + $actioncomm->authorid = $user->id; // User saving action |
|
| 1531 | + $actioncomm->userownerid = $user->id; // Owner of action |
|
| 1532 | 1532 | // Fields when action is a real email (content is already into note) |
| 1533 | 1533 | /*$actioncomm->email_msgid = $object->email_msgid; |
| 1534 | 1534 | $actioncomm->email_from = $object->email_from; |
@@ -1697,10 +1697,10 @@ discard block |
||
| 1697 | 1697 | $s .= pack('C1', 3) . pack('C1', strlen($datestring)) . $datestring; |
| 1698 | 1698 | $s .= pack('C1', 4) . pack('C1', strlen($pricewithtaxstring)) . $pricewithtaxstring; |
| 1699 | 1699 | $s .= pack('C1', 5) . pack('C1', strlen($pricetaxstring)) . $pricetaxstring; |
| 1700 | - $s .= ''; // Hash of xml invoice |
|
| 1701 | - $s .= ''; // ecda signature |
|
| 1702 | - $s .= ''; // ecda public key |
|
| 1703 | - $s .= ''; // ecda signature of public key stamp |
|
| 1700 | + $s .= ''; // Hash of xml invoice |
|
| 1701 | + $s .= ''; // ecda signature |
|
| 1702 | + $s .= ''; // ecda public key |
|
| 1703 | + $s .= ''; // ecda signature of public key stamp |
|
| 1704 | 1704 | |
| 1705 | 1705 | $s = base64_encode($s); |
| 1706 | 1706 | |
@@ -1768,8 +1768,8 @@ discard block |
||
| 1768 | 1768 | $s .= "S\n"; |
| 1769 | 1769 | $s .= dol_trunc($bankaccount->proprio, 70, 'right', 'UTF-8', 1) . "\n"; |
| 1770 | 1770 | $addresslinearray = explode("\n", $bankaccount->owner_address); |
| 1771 | - $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1 |
|
| 1772 | - $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2 |
|
| 1771 | + $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1 |
|
| 1772 | + $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2 |
|
| 1773 | 1773 | /*$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n"; |
| 1774 | 1774 | $s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n"; |
| 1775 | 1775 | $s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";*/ |
@@ -1777,8 +1777,8 @@ discard block |
||
| 1777 | 1777 | $s .= "S\n"; |
| 1778 | 1778 | $s .= dol_trunc($mysoc->name, 70, 'right', 'UTF-8', 1) . "\n"; |
| 1779 | 1779 | $addresslinearray = explode("\n", $mysoc->address); |
| 1780 | - $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1 |
|
| 1781 | - $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2 |
|
| 1780 | + $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1 |
|
| 1781 | + $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2 |
|
| 1782 | 1782 | $s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1) . "\n"; |
| 1783 | 1783 | $s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1) . "\n"; |
| 1784 | 1784 | $s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1) . "\n"; |
@@ -1798,14 +1798,14 @@ discard block |
||
| 1798 | 1798 | $s .= "S\n"; |
| 1799 | 1799 | $s .= dol_trunc($this->thirdparty->name, 70, 'right', 'UTF-8', 1) . "\n"; |
| 1800 | 1800 | $addresslinearray = explode("\n", $this->thirdparty->address); |
| 1801 | - $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1 |
|
| 1802 | - $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2 |
|
| 1801 | + $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1 |
|
| 1802 | + $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2 |
|
| 1803 | 1803 | $s .= dol_trunc($this->thirdparty->zip, 16, 'right', 'UTF-8', 1) . "\n"; |
| 1804 | 1804 | $s .= dol_trunc($this->thirdparty->town, 35, 'right', 'UTF-8', 1) . "\n"; |
| 1805 | 1805 | $s .= dol_trunc($this->thirdparty->country_code, 2, 'right', 'UTF-8', 1) . "\n"; |
| 1806 | 1806 | // ID of payment |
| 1807 | - $s .= "NON\n"; // NON or QRR |
|
| 1808 | - $s .= "\n"; // QR Code reference if previous field is QRR |
|
| 1807 | + $s .= "NON\n"; // NON or QRR |
|
| 1808 | + $s .= "\n"; // QR Code reference if previous field is QRR |
|
| 1809 | 1809 | // Free text |
| 1810 | 1810 | if ($complementaryinfo) { |
| 1811 | 1811 | $s .= $complementaryinfo . "\n"; |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 281 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 282 | 282 | /** |
| 283 | 283 | * Add description of a new optional attribute |
| 284 | 284 | * |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | */ |
| 309 | 309 | private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = '', $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array()) |
| 310 | 310 | { |
| 311 | - // phpcs:enable |
|
| 311 | + // phpcs:enable |
|
| 312 | 312 | global $conf, $user; |
| 313 | 313 | |
| 314 | 314 | if ($elementtype == 'thirdparty') { |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | |
| 491 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 491 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 492 | 492 | /** |
| 493 | 493 | * Delete description of an optional attribute |
| 494 | 494 | * |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | */ |
| 499 | 499 | private function delete_label($attrname, $elementtype = 'member') |
| 500 | 500 | { |
| 501 | - // phpcs:enable |
|
| 501 | + // phpcs:enable |
|
| 502 | 502 | global $conf; |
| 503 | 503 | |
| 504 | 504 | if ($elementtype == 'thirdparty') { |
@@ -651,7 +651,7 @@ discard block |
||
| 651 | 651 | } |
| 652 | 652 | } |
| 653 | 653 | |
| 654 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 654 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 655 | 655 | /** |
| 656 | 656 | * Modify description of personalized attribute |
| 657 | 657 | * |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | */ |
| 682 | 682 | private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = array(), $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array()) |
| 683 | 683 | { |
| 684 | - // phpcs:enable |
|
| 684 | + // phpcs:enable |
|
| 685 | 685 | global $conf, $user; |
| 686 | 686 | dol_syslog(get_class($this) . "::update_label " . $attrname . ", " . $label . ", " . $type . ", " . $size . ", " . $elementtype . ", " . $unique . ", " . $required . ", " . $pos . ", " . $alwayseditable . ", " . $perms . ", " . $list . ", " . $default . ", " . $computed . ", " . $entity . ", " . $langfile . ", " . $enabled . ", " . $totalizable . ", " . $printable); |
| 687 | 687 | |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | } |
| 826 | 826 | |
| 827 | 827 | |
| 828 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 828 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 829 | 829 | /** |
| 830 | 830 | * Load the array of extrafields definition $this->attributes |
| 831 | 831 | * |
@@ -835,7 +835,7 @@ discard block |
||
| 835 | 835 | */ |
| 836 | 836 | public function fetch_name_optionals_label($elementtype, $forceload = false) |
| 837 | 837 | { |
| 838 | - // phpcs:enable |
|
| 838 | + // phpcs:enable |
|
| 839 | 839 | global $conf; |
| 840 | 840 | |
| 841 | 841 | if (empty($elementtype)) { |
@@ -1127,7 +1127,7 @@ discard block |
||
| 1127 | 1127 | } else { |
| 1128 | 1128 | $out = $form->selectyesno($keyprefix . $key . $keysuffix, $value, 1, false, 1); |
| 1129 | 1129 | } |
| 1130 | - $out .= '<input type="hidden" name="' . $keyprefix . $key . $keysuffix . '_boolean" value="1">'; // A hidden field ending with "_boolean" that is always set to 1. |
|
| 1130 | + $out .= '<input type="hidden" name="' . $keyprefix . $key . $keysuffix . '_boolean" value="1">'; // A hidden field ending with "_boolean" that is always set to 1. |
|
| 1131 | 1131 | } elseif ($type == 'price') { |
| 1132 | 1132 | if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format. |
| 1133 | 1133 | $value = price($value); |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | } |
| 1150 | 1150 | $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> '; |
| 1151 | 1151 | } elseif ($type == 'select') { |
| 1152 | - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1152 | + $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1153 | 1153 | if ($mode) { |
| 1154 | 1154 | $options = array(); |
| 1155 | 1155 | foreach ($param['options'] as $okey => $val) { |
@@ -1204,7 +1204,7 @@ discard block |
||
| 1204 | 1204 | $out .= '</select>'; |
| 1205 | 1205 | } |
| 1206 | 1206 | } elseif ($type == 'sellist') { |
| 1207 | - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1207 | + $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1208 | 1208 | if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) { |
| 1209 | 1209 | include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; |
| 1210 | 1210 | $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0); |
@@ -1367,7 +1367,7 @@ discard block |
||
| 1367 | 1367 | } |
| 1368 | 1368 | $out = $form->multiselectarray($keyprefix . $key . $keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%'); |
| 1369 | 1369 | } elseif ($type == 'radio') { |
| 1370 | - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1370 | + $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1371 | 1371 | foreach ($param['options'] as $keyopt => $val) { |
| 1372 | 1372 | $out .= '<input class="flat ' . $morecss . '" type="radio" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : ''); |
| 1373 | 1373 | $out .= ' value="' . $keyopt . '"'; |
@@ -1595,7 +1595,7 @@ discard block |
||
| 1595 | 1595 | |
| 1596 | 1596 | $tmparray = explode(':', $param_list[0]); |
| 1597 | 1597 | |
| 1598 | - $element = $extrafieldsobjectkey; // $extrafieldsobjectkey comes from $object->table_element but we need $object->element |
|
| 1598 | + $element = $extrafieldsobjectkey; // $extrafieldsobjectkey comes from $object->table_element but we need $object->element |
|
| 1599 | 1599 | if ($element == 'socpeople') { |
| 1600 | 1600 | $element = 'contact'; |
| 1601 | 1601 | } elseif ($element == 'projet') { |
@@ -1643,7 +1643,7 @@ discard block |
||
| 1643 | 1643 | |
| 1644 | 1644 | $label = $this->attributes[$extrafieldsobjectkey]['label'][$key]; |
| 1645 | 1645 | $type = $this->attributes[$extrafieldsobjectkey]['type'][$key]; |
| 1646 | - $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; // Can be '255', '24,8'... |
|
| 1646 | + $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; // Can be '255', '24,8'... |
|
| 1647 | 1647 | $default = $this->attributes[$extrafieldsobjectkey]['default'][$key]; |
| 1648 | 1648 | $computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key]; |
| 1649 | 1649 | $unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key]; |
@@ -2146,7 +2146,7 @@ discard block |
||
| 2146 | 2146 | continue; |
| 2147 | 2147 | } |
| 2148 | 2148 | |
| 2149 | - if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_' . $key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')))) { |
|
| 2149 | + if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_' . $key) && (!in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')))) { |
|
| 2150 | 2150 | //when unticking boolean field, it's not set in POST |
| 2151 | 2151 | continue; |
| 2152 | 2152 | } |
@@ -2176,7 +2176,7 @@ discard block |
||
| 2176 | 2176 | $onlykey === '@GETPOSTISSET' |
| 2177 | 2177 | && in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')) |
| 2178 | 2178 | && in_array(abs($enabled), array(2, 5)) |
| 2179 | - && ! GETPOSTISSET('options_' . $key) // Update hidden checkboxes and multiselect only if they are provided |
|
| 2179 | + && !GETPOSTISSET('options_' . $key) // Update hidden checkboxes and multiselect only if they are provided |
|
| 2180 | 2180 | ) |
| 2181 | 2181 | ) { |
| 2182 | 2182 | continue; |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
| 115 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 115 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 116 | 116 | /** |
| 117 | 117 | * Function to build pdf onto disk |
| 118 | 118 | * |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0) |
| 128 | 128 | { |
| 129 | - // phpcs:enable |
|
| 129 | + // phpcs:enable |
|
| 130 | 130 | global $user, $langs, $conf, $mysoc, $hookmanager; |
| 131 | 131 | |
| 132 | 132 | if (!is_object($outputlangs)) { |
@@ -594,8 +594,8 @@ discard block |
||
| 594 | 594 | return 0; |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 598 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 597 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 598 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 599 | 599 | /** |
| 600 | 600 | * Show miscellaneous information (payment mode, payment term, ...) |
| 601 | 601 | * |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | */ |
| 608 | 608 | protected function _tableau_info(&$pdf, $object, $posy, $outputlangs) |
| 609 | 609 | { |
| 610 | - // phpcs:enable |
|
| 610 | + // phpcs:enable |
|
| 611 | 611 | global $conf, $mysoc; |
| 612 | 612 | $default_font_size = pdf_getPDFFontSize($outputlangs); |
| 613 | 613 | |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | } |
| 626 | 626 | |
| 627 | 627 | |
| 628 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 628 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 629 | 629 | /** |
| 630 | 630 | * Show table for lines |
| 631 | 631 | * |
@@ -675,7 +675,7 @@ discard block |
||
| 675 | 675 | } |
| 676 | 676 | } |
| 677 | 677 | |
| 678 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 678 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 679 | 679 | /** |
| 680 | 680 | * Show top header of page. |
| 681 | 681 | * |
@@ -853,7 +853,7 @@ discard block |
||
| 853 | 853 | return 0; |
| 854 | 854 | } |
| 855 | 855 | |
| 856 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 856 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 857 | 857 | /** |
| 858 | 858 | * Show footer of page. Need this->emetteur object |
| 859 | 859 | * |
@@ -822,7 +822,7 @@ |
||
| 822 | 822 | if ($this->page_largeur < 210) { |
| 823 | 823 | $widthrecbox = 84; // To work with US executive format |
| 824 | 824 | } |
| 825 | - $posy = 42; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 825 | + $posy = 42; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 826 | 826 | $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; |
| 827 | 827 | if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) { |
| 828 | 828 | $posx = $this->marge_gauche; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
| 136 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 136 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 137 | 137 | /** |
| 138 | 138 | * Function to build pdf onto disk |
| 139 | 139 | * |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | */ |
| 148 | 148 | public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0) |
| 149 | 149 | { |
| 150 | - // phpcs:enable |
|
| 150 | + // phpcs:enable |
|
| 151 | 151 | global $user, $langs, $conf, $mysoc, $hookmanager; |
| 152 | 152 | |
| 153 | 153 | if (!is_object($outputlangs)) { |
@@ -587,8 +587,8 @@ discard block |
||
| 587 | 587 | return 0; |
| 588 | 588 | } |
| 589 | 589 | |
| 590 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 591 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 590 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 591 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 592 | 592 | /** |
| 593 | 593 | * Show miscellaneous information (payment mode, payment term, ...) |
| 594 | 594 | * |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | */ |
| 601 | 601 | protected function _tableau_info(&$pdf, $object, $posy, $outputlangs) |
| 602 | 602 | { |
| 603 | - // phpcs:enable |
|
| 603 | + // phpcs:enable |
|
| 604 | 604 | global $conf, $mysoc; |
| 605 | 605 | $default_font_size = pdf_getPDFFontSize($outputlangs); |
| 606 | 606 | |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | $pdf->MultiCell($larg_sign, 2, $outputlangs->trans("ForCustomer") . ':', '', 'L'); |
| 618 | 618 | } |
| 619 | 619 | |
| 620 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 620 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 621 | 621 | /** |
| 622 | 622 | * Show table for lines |
| 623 | 623 | * |
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | } |
| 684 | 684 | } |
| 685 | 685 | |
| 686 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 686 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 687 | 687 | /** |
| 688 | 688 | * Show top header of page. |
| 689 | 689 | * |
@@ -861,7 +861,7 @@ discard block |
||
| 861 | 861 | return 0; |
| 862 | 862 | } |
| 863 | 863 | |
| 864 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 864 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 865 | 865 | /** |
| 866 | 866 | * Show footer of page. Need this->emetteur object |
| 867 | 867 | * |
@@ -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; |
@@ -830,7 +830,7 @@ discard block |
||
| 830 | 830 | if ($this->page_largeur < 210) { |
| 831 | 831 | $widthrecbox = 84; // To work with US executive format |
| 832 | 832 | } |
| 833 | - $posy = 42; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 833 | + $posy = 42; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 834 | 834 | $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; |
| 835 | 835 | if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) { |
| 836 | 836 | $posx = $this->marge_gauche; |