@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | |
| 26 | 26 | if (!defined('NOREQUIREDB')) { |
| 27 | - define('NOREQUIREDB', '1'); // Do not create database handler $db |
|
| 27 | + define('NOREQUIREDB', '1'); // Do not create database handler $db |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | $sapi_type = php_sapi_name(); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $result = array(); |
| 70 | 70 | while ($i < $argc) { |
| 71 | 71 | if (!empty($argv[$i])) { |
| 72 | - parse_str($argv[$i], $result); // set all params $release, $includecustom, $includeconstant, $buildzip ... |
|
| 72 | + parse_str($argv[$i], $result); // set all params $release, $includecustom, $includeconstant, $buildzip ... |
|
| 73 | 73 | } |
| 74 | 74 | if (!empty($result["release"])) { |
| 75 | 75 | $release = $result["release"]; |
@@ -78,9 +78,9 @@ discard block |
||
| 78 | 78 | $includecustom = $result["includecustom"]; |
| 79 | 79 | } |
| 80 | 80 | if (preg_match('/includeconstant=/', strval($argv[$i]))) { |
| 81 | - $tmp = explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str() |
|
| 81 | + $tmp = explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str() |
|
| 82 | 82 | if (count($tmp) != 3) { |
| 83 | - print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n"; |
|
| 83 | + print "Error: Bad parameter includeconstant=".$result['includeconstant']."\n"; |
|
| 84 | 84 | exit(1); |
| 85 | 85 | } |
| 86 | 86 | $includeconstants[$tmp[0]][$tmp[1]] = $tmp[2]; |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | $gitcommit = 'seetag'; |
| 161 | -$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release); // Keep only x.y into x.y.z |
|
| 161 | +$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release); // Keep only x.y into x.y.z |
|
| 162 | 162 | $fileforgit = dirname(dirname(dirname(__FILE__))).'/.git/refs/heads/'.$branchname; |
| 163 | 163 | print "Try to get last commit ID from file ".$fileforgit."\n"; |
| 164 | 164 | $fileforgitcontent = ''; |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php) |
| 191 | 191 | $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$'; |
| 192 | -$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs |
|
| 192 | +$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs |
|
| 193 | 193 | $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname'); |
| 194 | 194 | |
| 195 | 195 | $dir = ''; |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n"); |
| 233 | 233 | |
| 234 | 234 | $regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$'; |
| 235 | -$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs |
|
| 235 | +$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs |
|
| 236 | 236 | $files = dol_dir_list(dirname(__FILE__).'/../../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname'); |
| 237 | 237 | $dir = ''; |
| 238 | 238 | foreach ($files as $filetmp) { |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | ); |
| 284 | 284 | |
| 285 | 285 | $regextoinclude = '(\.php|\.sql)$'; |
| 286 | -$regextoexclude = ''; // Exclude dirs |
|
| 286 | +$regextoexclude = ''; // Exclude dirs |
|
| 287 | 287 | $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/blockedlog', 'files', 1, $regextoinclude, $regextoexclude, 'fullname'); |
| 288 | 288 | $dir = ''; |
| 289 | 289 | foreach ($files as $filetmp) { |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | } |
| 312 | 312 | // Add the SQL file |
| 313 | 313 | $regextoinclude = 'llx_blockedlog.*(\.php|\.sql)$'; |
| 314 | -$regextoexclude = ''; // Exclude dirs |
|
| 314 | +$regextoexclude = ''; // Exclude dirs |
|
| 315 | 315 | $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/install/mysql/tables', 'files', 0, $regextoinclude, $regextoexclude, 'fullname'); |
| 316 | 316 | foreach ($files as $filetmp) { |
| 317 | 317 | $file = $filetmp['fullname']; |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | $needtoclose = 1; |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | -$needtoclose = 1; // This is the last file |
|
| 397 | +$needtoclose = 1; // This is the last file |
|
| 398 | 398 | if (filetype($file) == "file") { |
| 399 | 399 | $md5 = md5_file($file); |
| 400 | 400 | $checksumconcat[] = $md5; |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | if (GETPOST('target') == 'remote') { |
| 204 | - $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php. |
|
| 204 | + $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php. |
|
| 205 | 205 | |
| 206 | 206 | // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) |
| 207 | 207 | if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != 400 && $xmlarray['http_code'] != 404) { |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | |
| 291 | 291 | $out .= $form->textwithpicto('', $text); |
| 292 | 292 | |
| 293 | - $out . '</td>'."\n"; |
|
| 293 | + $out.'</td>'."\n"; |
|
| 294 | 294 | $out .= "</tr>\n"; |
| 295 | 295 | } |
| 296 | 296 | |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | $out .= ' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm'.$i); |
| 479 | 479 | } |
| 480 | 480 | $out .= '</td>'."\n"; |
| 481 | - $out .= '<td class="center">'.dol_escape_htmltag((string) $file['expectedmd5']).'</td>'."\n"; // @phan-suppress-current-line PhanTypeInvalidDimOffset |
|
| 481 | + $out .= '<td class="center">'.dol_escape_htmltag((string) $file['expectedmd5']).'</td>'."\n"; // @phan-suppress-current-line PhanTypeInvalidDimOffset |
|
| 482 | 482 | $out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n"; |
| 483 | 483 | $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']); |
| 484 | 484 | $totalsize += $size; |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | $resultcode = 'ok'; |
| 550 | 550 | $resultcomment = 'Success'; |
| 551 | 551 | $outcurrentchecksum = '<span class="'.$resultcode.'" title="Checksum of all current checksums concatenated separated by a comma">'.$checksumget.'</span>'; |
| 552 | - $outcurrentchecksumtext.= img_picto('', 'tick').' <span class="'.$resultcode.'">'.$langs->trans($resultcomment).'</span>'; |
|
| 552 | + $outcurrentchecksumtext .= img_picto('', 'tick').' <span class="'.$resultcode.'">'.$langs->trans($resultcomment).'</span>'; |
|
| 553 | 553 | } |
| 554 | 554 | } else { |
| 555 | 555 | $resultcode = 'error'; |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; |
| 27 | 27 | require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; |
| 28 | 28 | require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; |
| 29 | -require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherentstats.class.php'; |
|
| 29 | +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php'; |
|
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php'; |
| 82 | 82 | $b = new BlockedLog($this->db); |
| 83 | - $b->loadTrackedEvents(); // Get the list of tracked events into $b->trackedevents |
|
| 83 | + $b->loadTrackedEvents(); // Get the list of tracked events into $b->trackedevents |
|
| 84 | 84 | |
| 85 | 85 | // Tracked events |
| 86 | 86 | if (!in_array($action, array_keys($b->trackedevents))) { |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | return -1; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - $res = $b->create($user); // Insert event in unalterable log. We are in a trigger so inside a global db transaction. |
|
| 151 | + $res = $b->create($user); // Insert event in unalterable log. We are in a trigger so inside a global db transaction. |
|
| 152 | 152 | |
| 153 | 153 | if ($res < 0) { |
| 154 | 154 | $this->setErrorsFromObject($b); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | $this->fk_user = $obj->fk_user; |
| 383 | 383 | $this->email = $obj->email; |
| 384 | 384 | $this->threshold = $obj->threshold; |
| 385 | - $this->context = $obj->context; |
|
| 385 | + $this->context = $obj->context; |
|
| 386 | 386 | $this->datec = $this->db->jdate($obj->datec); |
| 387 | 387 | $this->datem = $this->db->jdate($obj->datem); |
| 388 | 388 | } |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | while ($i < $num) { |
| 504 | 504 | $obj = $this->db->fetch_object($resql); |
| 505 | 505 | // we want to notify only if contact is enable |
| 506 | - if ($obj && $obj->status == 1) { |
|
| 506 | + if ($obj && $obj->status == 1) { |
|
| 507 | 507 | $newval2 = trim($obj->email); |
| 508 | 508 | $isvalid = isValidEmail($newval2); |
| 509 | 509 | if (empty($resarray[$newval2])) { |
@@ -1039,7 +1039,7 @@ discard block |
||
| 1039 | 1039 | 'notification' |
| 1040 | 1040 | ); |
| 1041 | 1041 | |
| 1042 | - if (! empty($mailfile->error) || ! empty($mailfile->errors)) { |
|
| 1042 | + if (!empty($mailfile->error) || !empty($mailfile->errors)) { |
|
| 1043 | 1043 | $this->error = $mailfile->error; |
| 1044 | 1044 | $this->errors = $mailfile->errors; |
| 1045 | 1045 | return -1; |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | 'notification' |
| 1367 | 1367 | ); |
| 1368 | 1368 | |
| 1369 | - if (! empty($mailfile->error) || ! empty($mailfile->errors)) { |
|
| 1369 | + if (!empty($mailfile->error) || !empty($mailfile->errors)) { |
|
| 1370 | 1370 | $this->error = $mailfile->error; |
| 1371 | 1371 | $this->errors = $mailfile->errors; |
| 1372 | 1372 | return -1; |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $previoushash = ''; |
| 172 | 172 | $firstid = ''; |
| 173 | 173 | |
| 174 | - if (! (GETPOSTINT('yeartoexport') > 0)) { |
|
| 174 | + if (!(GETPOSTINT('yeartoexport') > 0)) { |
|
| 175 | 175 | setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Year")), null, "errors"); |
| 176 | 176 | $error++; |
| 177 | 177 | } else { |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - if (! $error) { |
|
| 207 | + if (!$error) { |
|
| 208 | 208 | // We record the export as a new line into the unalterable logs |
| 209 | 209 | require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php'; |
| 210 | 210 | $b = new BlockedLog($db); |
@@ -284,13 +284,13 @@ discard block |
||
| 284 | 284 | $block_static->entity = $obj->entity; |
| 285 | 285 | |
| 286 | 286 | |
| 287 | - $block_static->date_creation = $db->jdate($obj->date_creation); // TODO Use gmt |
|
| 287 | + $block_static->date_creation = $db->jdate($obj->date_creation); // TODO Use gmt |
|
| 288 | 288 | |
| 289 | - $block_static->amounts = (float) $obj->amounts; // Database store value with 8 digits, we cut ending 0 them with (flow) |
|
| 289 | + $block_static->amounts = (float) $obj->amounts; // Database store value with 8 digits, we cut ending 0 them with (flow) |
|
| 290 | 290 | $block_static->vat = $obj->vat; |
| 291 | 291 | |
| 292 | 292 | $block_static->action = $obj->action; |
| 293 | - $block_static->date_object = $db->jdate($obj->date_object); // TODO Use gmt ? |
|
| 293 | + $block_static->date_object = $db->jdate($obj->date_object); // TODO Use gmt ? |
|
| 294 | 294 | $block_static->ref_object = $obj->ref_object; |
| 295 | 295 | |
| 296 | 296 | $block_static->user_fullname = $obj->user_fullname; |
@@ -300,14 +300,14 @@ discard block |
||
| 300 | 300 | // Old hash + Previous fields concatenated = signature |
| 301 | 301 | $block_static->signature = $obj->signature; |
| 302 | 302 | |
| 303 | - $block_static->element = $obj->element; // Not in signature |
|
| 304 | - $block_static->fk_object = $obj->fk_object; // Not in signature |
|
| 303 | + $block_static->element = $obj->element; // Not in signature |
|
| 304 | + $block_static->fk_object = $obj->fk_object; // Not in signature |
|
| 305 | 305 | |
| 306 | - $block_static->fk_user = $obj->fk_user; // Not in signature |
|
| 306 | + $block_static->fk_user = $obj->fk_user; // Not in signature |
|
| 307 | 307 | |
| 308 | - $block_static->date_modification = $db->jdate($obj->tms); // Not in signature |
|
| 309 | - $block_static->object_version = $obj->object_version; // Not in signature |
|
| 310 | - $block_static->object_format = $obj->object_format; // Not in signature |
|
| 308 | + $block_static->date_modification = $db->jdate($obj->tms); // Not in signature |
|
| 309 | + $block_static->object_version = $obj->object_version; // Not in signature |
|
| 310 | + $block_static->object_format = $obj->object_format; // Not in signature |
|
| 311 | 311 | |
| 312 | 312 | $block_static->signature_line = $obj->signature_line; |
| 313 | 313 | $block_static->certified = ($obj->certified == 1); |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | |
| 738 | 738 | // Link to source object |
| 739 | 739 | print '<td class="tdoverflowmax150"'.(preg_match('/<a/', $object_link) ? '' : 'title="'.dol_escape_htmltag(dol_string_nohtmltag($object_link.($object_link_title ? ' - '.$object_link_title : ''))).'"').'>'; |
| 740 | - print '<!-- object_link -->'; // $object_link can be a '<a href' link or a text |
|
| 740 | + print '<!-- object_link -->'; // $object_link can be a '<a href' link or a text |
|
| 741 | 741 | print $object_link; |
| 742 | 742 | print '</td>'; |
| 743 | 743 | |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | 'linkedObjectsIds', |
| 530 | 530 | 'linkedObjects', |
| 531 | 531 | 'fk_delivery_address', |
| 532 | - 'projet', // There is already ->fk_project |
|
| 532 | + 'projet', // There is already ->fk_project |
|
| 533 | 533 | 'restrictiononfksoc', |
| 534 | 534 | 'specimen', |
| 535 | 535 | ); |
@@ -874,18 +874,18 @@ discard block |
||
| 874 | 874 | if ($resql) { |
| 875 | 875 | $obj = $this->db->fetch_object($resql); |
| 876 | 876 | if ($obj) { |
| 877 | - $this->id = $obj->rowid; |
|
| 878 | - $this->entity = $obj->entity; |
|
| 877 | + $this->id = $obj->rowid; |
|
| 878 | + $this->entity = $obj->entity; |
|
| 879 | 879 | |
| 880 | - $this->date_creation = $this->db->jdate($obj->date_creation); // TODO Use gmt ? |
|
| 881 | - $this->date_modification = $this->db->jdate($obj->tms); // TODO Use gmt ? |
|
| 880 | + $this->date_creation = $this->db->jdate($obj->date_creation); // TODO Use gmt ? |
|
| 881 | + $this->date_modification = $this->db->jdate($obj->tms); // TODO Use gmt ? |
|
| 882 | 882 | |
| 883 | 883 | $this->amounts = (float) $obj->amounts; |
| 884 | 884 | $this->action = $obj->action; |
| 885 | 885 | $this->element = $obj->element; |
| 886 | 886 | |
| 887 | 887 | $this->fk_object = $obj->fk_object; |
| 888 | - $this->date_object = $this->db->jdate($obj->date_object); // TODO Use gmt ? |
|
| 888 | + $this->date_object = $this->db->jdate($obj->date_object); // TODO Use gmt ? |
|
| 889 | 889 | $this->ref_object = $obj->ref_object; |
| 890 | 890 | |
| 891 | 891 | $this->fk_user = $obj->fk_user; |
@@ -896,7 +896,7 @@ discard block |
||
| 896 | 896 | $this->object_format = $obj->object_format; |
| 897 | 897 | |
| 898 | 898 | $this->signature = $obj->signature; |
| 899 | - $this->signature_line = $obj->signature_line; |
|
| 899 | + $this->signature_line = $obj->signature_line; |
|
| 900 | 900 | $this->certified = ($obj->certified == 1); |
| 901 | 901 | |
| 902 | 902 | return 1; |
@@ -1010,14 +1010,14 @@ discard block |
||
| 1010 | 1010 | $this->date_creation = dol_now(); |
| 1011 | 1011 | |
| 1012 | 1012 | $this->object_version = DOL_VERSION; |
| 1013 | - $this->object_format = 'V1'; // Must match the rules into buildKeyForSignature and buildFirstPartOfKeyForSignature |
|
| 1013 | + $this->object_format = 'V1'; // Must match the rules into buildKeyForSignature and buildFirstPartOfKeyForSignature |
|
| 1014 | 1014 | |
| 1015 | 1015 | |
| 1016 | 1016 | $this->db->begin(); |
| 1017 | 1017 | |
| 1018 | 1018 | $previoushash = $this->getPreviousHash(1, 0); // This get last record and lock database until insert is done and transaction closed |
| 1019 | 1019 | |
| 1020 | - $concatenatedata = $this->buildKeyForSignature(); // All the information for the hash (meta data + data saved) |
|
| 1020 | + $concatenatedata = $this->buildKeyForSignature(); // All the information for the hash (meta data + data saved) |
|
| 1021 | 1021 | |
| 1022 | 1022 | $this->debuginfo = $this->buildFirstPartOfKeyForSignature(); |
| 1023 | 1023 | |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | $sql .= " fk_user,"; |
| 1048 | 1048 | $sql .= " user_fullname,"; |
| 1049 | 1049 | $sql .= " entity,"; |
| 1050 | - $sql .= " debuginfo"; // Only stored |
|
| 1050 | + $sql .= " debuginfo"; // Only stored |
|
| 1051 | 1051 | $sql .= ") VALUES ("; |
| 1052 | 1052 | $sql .= "'".$this->db->idate($this->date_creation)."',"; |
| 1053 | 1053 | $sql .= "'".$this->db->escape($this->action)."',"; |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | $id = GETPOSTINT('id'); // id of record |
| 65 | 65 | $mode = GETPOST('mode', 'aZ09'); // '' or '_tmp' |
| 66 | -$piece_num = GETPOSTINT("piece_num") ? GETPOSTINT("piece_num") : GETPOST('ref'); // id of transaction (several lines share the same transaction id) |
|
| 66 | +$piece_num = GETPOSTINT("piece_num") ? GETPOSTINT("piece_num") : GETPOST('ref'); // id of transaction (several lines share the same transaction id) |
|
| 67 | 67 | $clonedate = (int) GETPOSTINT('clonedate'); |
| 68 | 68 | |
| 69 | 69 | $accountingaccount = new AccountingAccount($db); |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $error = 0; |
| 130 | 130 | |
| 131 | 131 | if ($cancel) { |
| 132 | - header("Location: ". $backtopage . (!empty($type) ? '?type=sub' : '')); |
|
| 132 | + header("Location: ".$backtopage.(!empty($type) ? '?type=sub' : '')); |
|
| 133 | 133 | exit; |
| 134 | 134 | } |
| 135 | 135 | |
@@ -201,14 +201,14 @@ discard block |
||
| 201 | 201 | $subledger_account_str = is_array($subledger_account) ? reset($subledger_account) : (string) $subledger_account; |
| 202 | 202 | if (!checkGeneralAccountAllowsAuxiliary($db, $accountingaccount_number, $subledger_account_str)) { |
| 203 | 203 | $error++; |
| 204 | - setEventMessages($langs->trans("ErrorAccountNotCentralized"). ". " . $langs->trans("RemoveSubsidiaryAccountOrAdjustTheGeneralAccount"), null, 'errors'); |
|
| 204 | + setEventMessages($langs->trans("ErrorAccountNotCentralized").". ".$langs->trans("RemoveSubsidiaryAccountOrAdjustTheGeneralAccount"), null, 'errors'); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | if (!$error) { |
| 208 | 208 | if (GETPOSTINT('doc_datemonth') && GETPOSTINT('doc_dateday') && GETPOSTINT('doc_dateyear')) { |
| 209 | 209 | $datedoc = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear')); |
| 210 | 210 | } else { |
| 211 | - $datedoc = (int) GETPOSTINT('doc_date'); // TODO Use instead the mode day-month-year |
|
| 211 | + $datedoc = (int) GETPOSTINT('doc_date'); // TODO Use instead the mode day-month-year |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | $object = new BookKeeping($db); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | if ($result < 0) { |
| 383 | 383 | setEventMessages($object->error, $object->errors, 'errors'); |
| 384 | 384 | } else { |
| 385 | - header("Location: " . $backtopage . "?sortfield=t.piece_num&sortorder=asc" . ($type ? '&type='.$type : '')); |
|
| 385 | + header("Location: ".$backtopage."?sortfield=t.piece_num&sortorder=asc".($type ? '&type='.$type : '')); |
|
| 386 | 386 | exit; |
| 387 | 387 | } |
| 388 | 388 | } |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | array( |
| 465 | 465 | 'type' => 'date', |
| 466 | 466 | 'name' => 'clonedate', |
| 467 | - 'label' => '<span class="fieldrequired">' . $langs->trans("Docdate") . '</span>', |
|
| 467 | + 'label' => '<span class="fieldrequired">'.$langs->trans("Docdate").'</span>', |
|
| 468 | 468 | 'value' => $input1 |
| 469 | 469 | ) |
| 470 | 470 | ); |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | $formquestion[] = array( |
| 474 | 474 | 'type' => 'text', |
| 475 | 475 | 'name' => 'code_journal', |
| 476 | - 'label' => '<span class="fieldrequired">' . $langs->trans("Codejournal") . '</span>', |
|
| 476 | + 'label' => '<span class="fieldrequired">'.$langs->trans("Codejournal").'</span>', |
|
| 477 | 477 | 'value' => $input2 |
| 478 | 478 | ); |
| 479 | 479 | } |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | |
| 498 | 498 | if (!$error) { |
| 499 | 499 | $db->commit(); |
| 500 | - header("Location: " . $_SERVER['PHP_SELF'] . "?piece_num=" . $object->getNextNumMvt() - 1); |
|
| 500 | + header("Location: ".$_SERVER['PHP_SELF']."?piece_num=".$object->getNextNumMvt() - 1); |
|
| 501 | 501 | exit(); |
| 502 | 502 | } else { |
| 503 | 503 | $db->rollback(); |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | |
| 528 | 528 | // Update fields properties in realtime |
| 529 | 529 | if (!empty($conf->use_javascript_ajax)) { |
| 530 | - print "\n" . '<script type="text/javascript">'; |
|
| 530 | + print "\n".'<script type="text/javascript">'; |
|
| 531 | 531 | print '$(document).ready(function () { |
| 532 | 532 | function toggleSubledger() { |
| 533 | 533 | var isCentral = $("#accountingaccount_number option:selected").data("centralized"); |
@@ -544,8 +544,8 @@ discard block |
||
| 544 | 544 | $("#accountingaccount_number").on("change", toggleSubledger); |
| 545 | 545 | $("#accountingaccount_number").on("select2:select", toggleSubledger); |
| 546 | 546 | '; |
| 547 | - print ' });' . "\n"; |
|
| 548 | - print ' </script>' . "\n"; |
|
| 547 | + print ' });'."\n"; |
|
| 548 | + print ' </script>'."\n"; |
|
| 549 | 549 | } |
| 550 | 550 | |
| 551 | 551 | if ($action == 'create') { |
@@ -640,7 +640,7 @@ discard block |
||
| 640 | 640 | //$object->label = $object->doc_ref; |
| 641 | 641 | if ($mode == '_tmp') { |
| 642 | 642 | $object->context['mode'] = $mode; |
| 643 | - $object->next_prev_filter = '1=0'; // Add a test always false to disable navigation into the dol_banner_tab. In tmp mode, we just want to create/edit lines of bank transaction. |
|
| 643 | + $object->next_prev_filter = '1=0'; // Add a test always false to disable navigation into the dol_banner_tab. In tmp mode, we just want to create/edit lines of bank transaction. |
|
| 644 | 644 | } |
| 645 | 645 | $object->label = $object->ref; |
| 646 | 646 | |
@@ -827,7 +827,7 @@ discard block |
||
| 827 | 827 | // Due date (if invoice) |
| 828 | 828 | //if (in_array($object->doc_type, array('customer_invoice', 'supplier_invoice'))) { |
| 829 | 829 | print '<tr>'; |
| 830 | - print '<td class="titlefield">' . $form->textwithpicto($langs->trans('DateDue'), $langs->trans("IfTransactionHasDueDate")) . '</td>'; |
|
| 830 | + print '<td class="titlefield">'.$form->textwithpicto($langs->trans('DateDue'), $langs->trans("IfTransactionHasDueDate")).'</td>'; |
|
| 831 | 831 | print '<td>'; |
| 832 | 832 | print $object->date_lim_reglement ? dol_print_date($object->date_lim_reglement, 'day') : ' '; |
| 833 | 833 | print '</td>'; |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | if ($mode != "_tmp") { |
| 839 | 839 | // Date document export |
| 840 | 840 | print '<tr>'; |
| 841 | - print '<td class="titlefield">' . $langs->trans("DateExport") . '</td>'; |
|
| 841 | + print '<td class="titlefield">'.$langs->trans("DateExport").'</td>'; |
|
| 842 | 842 | print '<td>'; |
| 843 | 843 | print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : ' '; |
| 844 | 844 | print '</td>'; |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | |
| 847 | 847 | // Date document validation |
| 848 | 848 | print '<tr>'; |
| 849 | - print '<td class="titlefield">' . $langs->trans("DateValidation") . '</td>'; |
|
| 849 | + print '<td class="titlefield">'.$langs->trans("DateValidation").'</td>'; |
|
| 850 | 850 | print '<td>'; |
| 851 | 851 | print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : ' '; |
| 852 | 852 | print '</td>'; |
@@ -855,7 +855,7 @@ discard block |
||
| 855 | 855 | // Id_import |
| 856 | 856 | if (!empty($object->import_key)) { |
| 857 | 857 | print '<tr>'; |
| 858 | - print '<td class="titlefield">' . $langs->trans("ImportId") . '</td>'; |
|
| 858 | + print '<td class="titlefield">'.$langs->trans("ImportId").'</td>'; |
|
| 859 | 859 | print '<td>'; |
| 860 | 860 | print $object->import_key; |
| 861 | 861 | print '</td>'; |
@@ -914,7 +914,7 @@ discard block |
||
| 914 | 914 | print dol_get_fiche_end(); |
| 915 | 915 | |
| 916 | 916 | |
| 917 | - $result = $object->fetchAllPerMvt($piece_num, $mode); // This load $object->linesmvt |
|
| 917 | + $result = $object->fetchAllPerMvt($piece_num, $mode); // This load $object->linesmvt |
|
| 918 | 918 | |
| 919 | 919 | if ($result < 0) { |
| 920 | 920 | setEventMessages($object->error, $object->errors, 'errors'); |
@@ -945,7 +945,7 @@ discard block |
||
| 945 | 945 | } |
| 946 | 946 | } |
| 947 | 947 | if ($permissiontoadd) { |
| 948 | - print dolGetButtonAction('', $langs->trans('Clone'), 'clone', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=clonebookkeepingwriting&token=' . newToken() . '&piece_num=' . ((int) $object->piece_num) . '&toselect=' . implode(',', $tmptoselect), 'action-clone', $permissiontoadd); |
|
| 948 | + print dolGetButtonAction('', $langs->trans('Clone'), 'clone', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=clonebookkeepingwriting&token='.newToken().'&piece_num='.((int) $object->piece_num).'&toselect='.implode(',', $tmptoselect), 'action-clone', $permissiontoadd); |
|
| 949 | 949 | } |
| 950 | 950 | } |
| 951 | 951 | |
@@ -1048,14 +1048,14 @@ discard block |
||
| 1048 | 1048 | if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) { |
| 1049 | 1049 | print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label'); |
| 1050 | 1050 | } else { |
| 1051 | - print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">'; |
|
| 1051 | + print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">'; |
|
| 1052 | 1052 | } |
| 1053 | - print '<br><input type="text" class="maxwidth150" name="subledger_label" id="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">'; |
|
| 1053 | + print '<br><input type="text" class="maxwidth150" name="subledger_label" id="subledger_label" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">'; |
|
| 1054 | 1054 | print '</td>'; |
| 1055 | - print '<td><input type="text" class="minwidth200" name="label_operation" value="' . dol_escape_htmltag($label_operation) . '"/></td>'; |
|
| 1055 | + print '<td><input type="text" class="minwidth200" name="label_operation" value="'.dol_escape_htmltag($label_operation).'"/></td>'; |
|
| 1056 | 1056 | print '<td class="right"><input type="text" class="right width50" name="debit" value=""/></td>'; |
| 1057 | 1057 | print '<td class="right"><input type="text" class="right width50" name="credit" value=""/></td>'; |
| 1058 | - print '<td class="center"><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '"></td>'; |
|
| 1058 | + print '<td class="center"><input type="submit" class="button small" name="save" value="'.$langs->trans("Add").'"></td>'; |
|
| 1059 | 1059 | print "</tr>\n"; |
| 1060 | 1060 | } |
| 1061 | 1061 | } else { |
@@ -1081,7 +1081,7 @@ discard block |
||
| 1081 | 1081 | print '<td class="center nowraponall">'; |
| 1082 | 1082 | if ($permissiontoadd) { |
| 1083 | 1083 | if (empty($line->date_export) && empty($line->date_validation)) { |
| 1084 | - print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . ((int) $line->piece_num) . '&mode=' . urlencode((string) $mode) . '&token=' . urlencode(newToken()) . '">'; |
|
| 1084 | + print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=update&id='.$line->id.'&piece_num='.((int) $line->piece_num).'&mode='.urlencode((string) $mode).'&token='.urlencode(newToken()).'">'; |
|
| 1085 | 1085 | print img_edit('', 0, 'class="marginrightonly"'); |
| 1086 | 1086 | print '</a> '; |
| 1087 | 1087 | } else { |
@@ -1096,7 +1096,7 @@ discard block |
||
| 1096 | 1096 | $actiontodelete = 'confirm_delete'; |
| 1097 | 1097 | } |
| 1098 | 1098 | |
| 1099 | - print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . ((int) $line->piece_num) . '&mode=' . urlencode((string) $mode) . '&token=' . urlencode(newToken()) . '">'; |
|
| 1099 | + print '<a href="'.$_SERVER["PHP_SELF"].'?action='.$actiontodelete.'&id='.$line->id.'&piece_num='.((int) $line->piece_num).'&mode='.urlencode((string) $mode).'&token='.urlencode(newToken()).'">'; |
|
| 1100 | 1100 | print img_delete(); |
| 1101 | 1101 | print '</a>'; |
| 1102 | 1102 | } else { |