From bd9bb59780c38988183b81b898787326f9ec0334 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 20 Feb 2023 20:57:46 +0100 Subject: [PATCH] Fix shipment status on card + llxheader --- htdocs/expedition/card.php | 2 +- htdocs/expedition/class/expedition.class.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index a9fcea34440..bfc2856c22d 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -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'; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 0b8668a6c1a..3f27fd35f88 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -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);