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

Update commonobject.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-05 09:57:51 +02:00 committed by GitHub
parent 7ae405a254
commit 9785e9b298
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/class/commonobject.class.php
View File

@ -2963,20 +2963,20 @@ abstract class CommonObject
foreach ($this->lines as $line) foreach ($this->lines as $line)
{ {
$totalOrdered+=$line->qty_asked ?: 0; // defined for shipment only $totalOrdered+=($line->qty_asked ? $line->qty_asked : 0); // defined for shipment only
$totalToShip+= $line->qty_shipped ?: 0; // defined for shipment only $totalToShip+=($line->qty_shipped ? $line->qty_shipped : 0); // defined for shipment only
// Define qty, weight, volume, weight_units, volume_units // Define qty, weight, volume, weight_units, volume_units
if ($this->element == 'shipping') { if ($this->element == 'shipping') {
// for shipments // for shipments
$qty = $line->qty_shipped ?: 0; $qty = $line->qty_shipped ? $line->qty_shipped : 0;
} }
else { else {
$qty = $line->qty ?: 0; $qty = $line->qty ? $line->qty : 0;
} }
$weight = $line->weight ?: 0; $weight = $line->weight ? $line->weight : 0;
$volume = $line->volume ?: 0; $volume = $line->volume ? $line->volume : 0;
$weight_units=$line->weight_units; $weight_units=$line->weight_units;
$volume_units=$line->volume_units; $volume_units=$line->volume_units;