Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Update livraison.class.php

Browse Source
This commit is contained in:
Laurent Destailleur
2020-04-02 12:55:06 +02:00
committed by GitHub
parent fb80199713
commit a2fd363f91
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/livraison/class/livraison.class.php
View File

@@ -775,7 +775,7 @@ class Livraison extends CommonObject
$this->lines = array();
$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped, ld.fk_origin_line, ";
$sql.= " cd.qty as qty_asked, cd.label as custom_label, cd.fk_unit ,";
$sql.= " cd.qty as qty_asked, cd.label as custom_label, cd.fk_unit,";
$sql.= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc,";
$sql.= " p.weight, p.weight_units, p.width, p.width_units, p.length, p.length_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
@@ -813,7 +813,7 @@ class Livraison extends CommonObject
$line->price = $obj->price;
$line->total_ht = $obj->total_ht;
// Add
// units
$line->weight = $obj->weight;
$line->weight_units = $obj->weight_units;
$line->width = $obj->width;
@@ -827,7 +827,6 @@ class Livraison extends CommonObject
$line->volume = $obj->volume;
$line->volume_units = $obj->volume_units;
$line->fk_unit = $obj->fk_unit;
$this->lines[$i] = $line;