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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-21 02:36:49 +01:00
commit eb3472d5f7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/card.php
View File

@ -837,7 +837,7 @@ if ($action == 'create2') {
}
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
llxHeader('', $title, 'Expedition', $help_url);
llxHeader('', $title, $help_url);
if (empty($action)) {
$action = 'view';

3
htdocs/expedition/class/expedition.class.php
View File

@ -563,7 +563,8 @@ class Expedition extends CommonObject
$this->socid = $obj->socid;
$this->ref_customer = $obj->ref_customer;
$this->ref_ext = $obj->ref_ext;
$this->statut = $obj->fk_statut;
$this->status = $obj->fk_statut;
$this->statut = $this->status; // Deprecated
$this->user_author_id = $obj->fk_user_author;
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_valid = $this->db->jdate($obj->date_valid);