lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19028 from aspangaro/14p24

Browse Source 
PHP8
This commit is contained in:
Laurent Destailleur 2021-10-20 12:45:13 +02:00 committed by GitHub
commit 2852e6ff9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -937,7 +937,6 @@ class BookKeeping extends CommonObject
$line->piece_num = $obj->piece_num; $line->piece_num = $obj->piece_num;
$line->date_creation = $this->db->jdate($obj->date_creation); $line->date_creation = $this->db->jdate($obj->date_creation);
$line->date_export = $this->db->jdate($obj->date_export); $line->date_export = $this->db->jdate($obj->date_export);
$line->date_validation = $this->db->jdate($obj->date_validated);
$line->date_validation = $this->db->jdate($obj->date_validation); $line->date_validation = $this->db->jdate($obj->date_validation);
$this->lines[] = $line; $this->lines[] = $line;
@ -1090,7 +1089,6 @@ class BookKeeping extends CommonObject
$line->date_lim_reglement = $this->db->jdate($obj->date_lim_reglement); $line->date_lim_reglement = $this->db->jdate($obj->date_lim_reglement);
$line->date_modification = $this->db->jdate($obj->date_modification); $line->date_modification = $this->db->jdate($obj->date_modification);
$line->date_export = $this->db->jdate($obj->date_export); $line->date_export = $this->db->jdate($obj->date_export);
$line->date_validation = $this->db->jdate($obj->date_validated);
$line->date_validation = $this->db->jdate($obj->date_validation); $line->date_validation = $this->db->jdate($obj->date_validation);
$this->lines[] = $line; $this->lines[] = $line;
@ -1751,7 +1749,6 @@ class BookKeeping extends CommonObject
$line->date_creation = $obj->date_creation; $line->date_creation = $obj->date_creation;
$line->date_modification = $obj->date_modification; $line->date_modification = $obj->date_modification;
$line->date_export = $obj->date_export; $line->date_export = $obj->date_export;
$line->date_validation = $obj->date_validated;
$line->date_validation = $obj->date_validation; $line->date_validation = $obj->date_validation;
$this->linesmvt[] = $line; $this->linesmvt[] = $line;
@ -1816,7 +1813,6 @@ class BookKeeping extends CommonObject
$line->sens = $obj->sens; $line->sens = $obj->sens;
$line->code_journal = $obj->code_journal; $line->code_journal = $obj->code_journal;
$line->piece_num = $obj->piece_num; $line->piece_num = $obj->piece_num;
$line->date_validation = $obj->date_validated;
$line->date_validation = $obj->date_validation; $line->date_validation = $obj->date_validation;
$this->linesexport[] = $line; $this->linesexport[] = $line;

4
htdocs/core/lib/accounting.lib.php
View File

@ -103,7 +103,7 @@ function length_accountg($account)
return $account; return $account;
} }
$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT; $g = getDolGlobalInt('ACCOUNTING_LENGTH_GACCOUNT');
if (!is_empty($g)) { if (!is_empty($g)) {
// Clean parameters // Clean parameters
$i = strlen($account); $i = strlen($account);
@ -142,7 +142,7 @@ function length_accounta($accounta)
return $accounta; return $accounta;
} }
$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT; $a = getDolGlobalInt('ACCOUNTING_LENGTH_AACCOUNT');
if (!is_empty($a)) { if (!is_empty($a)) {
// Clean parameters // Clean parameters
$i = strlen($accounta); $i = strlen($accounta);