Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-09 01:12:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX #4282 Defined shipping time were not shown in Customer order's PDF documents

Browse Source
This commit is contained in:
Marcos García de La Fuente
2015-12-27 13:10:33 +01:00
parent 2d3915b88c
commit 67bdfa2617
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/commande/class/commande.class.php
View File

@@ -89,10 +89,39 @@ class Commande extends CommonOrder
var $cond_reglement_id;
var $cond_reglement_code;
var $fk_account;
/**
* It holds the label of the payment mode. Use it in case translation cannot be found.
* @var string
*/
var $mode_reglement;
/**
* Payment mode id
* @var int
*/
var $mode_reglement_id;
/**
* Payment mode code
* @var string
*/
var $mode_reglement_code;
/**
* Availability delivery time id
* @var int
*/
var $availability_id;
/**
* Availability delivery time code
* @var string
*/
var $availability_code;
/**
* Label of availability delivery time. Use it in case translation cannot be found.
* @var string
*/
var $availability;
var $demand_reason_id;
var $demand_reason_code;
var $fk_delivery_address;
@@ -1470,7 +1499,7 @@ class Commande extends CommonOrder
$sql.= ", i.libelle as libelle_incoterms";
$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
$sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
$sql.= ', ca.code as availability_code';
$sql.= ', ca.code as availability_code, ca.label as availability_label';
$sql.= ', dr.code as demand_reason_code';
$sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid)';
@@ -1527,6 +1556,7 @@ class Commande extends CommonOrder
$this->fk_account = $obj->fk_account;
$this->availability_id = $obj->fk_availability;
$this->availability_code = $obj->availability_code;
$this->availability = $obj->availability_label;
$this->demand_reason_id = $obj->fk_input_reason;
$this->demand_reason_code = $obj->demand_reason_code;
$this->date_livraison = $this->db->jdate($obj->date_livraison);