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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-09 12:48:51 +02:00
commit 974a1c2c6d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,7 +537,7 @@ if ($action == 'create') {
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Date document creation // Date document export
print '<tr>'; print '<tr>';
print '<td class="titlefield">'.$langs->trans("DateExport").'</td>'; print '<td class="titlefield">'.$langs->trans("DateExport").'</td>';
print '<td>'; print '<td>';
@ -545,7 +545,7 @@ if ($action == 'create') {
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Date document creation // Date document validation
print '<tr>'; print '<tr>';
print '<td class="titlefield">'.$langs->trans("DateValidation").'</td>'; print '<td class="titlefield">'.$langs->trans("DateValidation").'</td>';
print '<td>'; print '<td>';

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

@ -1653,11 +1653,10 @@ class BookKeeping extends CommonObject
$this->doc_date = $this->db->jdate($obj->doc_date); $this->doc_date = $this->db->jdate($obj->doc_date);
$this->doc_ref = $obj->doc_ref; $this->doc_ref = $obj->doc_ref;
$this->doc_type = $obj->doc_type; $this->doc_type = $obj->doc_type;
$this->date_creation = $obj->date_creation; $this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_modification = $obj->date_modification; $this->date_modification = $this->db->jdate($obj->date_modification);
$this->date_export = $obj->date_export; $this->date_export = $this->db->jdate($obj->date_export);
$this->date_validation = $obj->date_validated; $this->date_validation = $this->db->jdate($obj->date_validation);
$this->date_validation = $obj->date_validation;
} else { } else {
$this->error = "Error ".$this->db->lasterror(); $this->error = "Error ".$this->db->lasterror();
dol_syslog(__METHOD__.$this->error, LOG_ERR); dol_syslog(__METHOD__.$this->error, LOG_ERR);