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

enhance shipping tooltip

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-02-13 23:42:08 +01:00
parent b9243376af
commit adc7d1fae2
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,15 @@ class Expedition extends CommonObject
*/ */
public $fields = array(); public $fields = array();
/**
* @var int ID of user author
*/
public $user_author_id;
/**
* @var int ID of user author
*/
public $fk_user_author;
public $socid; public $socid;
@ -175,8 +184,35 @@ class Expedition extends CommonObject
public $meths; public $meths;
public $listmeths; // List of carriers public $listmeths; // List of carriers
/**
* @var int ID of order
*/
public $commande_id;
/**
* @var Commande order
*/
public $commande;
/**
* @var ExpeditionLigne[] array of shipping lines
*/
public $lines = array(); public $lines = array();
// Multicurrency
/**
* @var int Currency ID
*/
public $fk_multicurrency;
/**
* @var string multicurrency code
*/
public $multicurrency_code;
public $multicurrency_tx;
public $multicurrency_total_ht;
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
/** /**
* Draft status * Draft status
@ -565,6 +601,7 @@ class Expedition extends CommonObject
$this->ref_ext = $obj->ref_ext; $this->ref_ext = $obj->ref_ext;
$this->statut = $obj->fk_statut; $this->statut = $obj->fk_statut;
$this->user_author_id = $obj->fk_user_author; $this->user_author_id = $obj->fk_user_author;
$this->fk_user_author = $obj->fk_user_author;
$this->date_creation = $this->db->jdate($obj->date_creation); $this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_valid = $this->db->jdate($obj->date_valid); $this->date_valid = $this->db->jdate($obj->date_valid);
$this->date = $this->db->jdate($obj->date_expedition); // TODO deprecated $this->date = $this->db->jdate($obj->date_expedition); // TODO deprecated