From 36bd63c1a7b7292924e78aa6cb77ea060162a4c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 01:21:33 +0100
Subject: [PATCH] NEW PHP 7.1 compatibility
---
htdocs/core/class/commonobject.class.php | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fd15bdd5886..b75bc9e3d05 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3017,9 +3017,16 @@ abstract class CommonObject
foreach ($this->lines as $line)
{
-
- $totalOrdered+=$line->qty_asked; // defined for shipment only
- $totalToShip+=$line->qty_shipped; // defined for shipment only
+ if (isset($line->qty_asked))
+ {
+ if (empty($totalOrdered)) $totalOrdered=0; // Avoid warning because $totalOrdered is ''
+ $totalOrdered+=$line->qty_asked; // defined for shipment only
+ }
+ if (isset($line->qty_shipped))
+ {
+ if (empty($totalToShip)) $totalToShip=0; // Avoid warning because $totalToShip is ''
+ $totalToShip+=$line->qty_shipped; // defined for shipment only
+ }
// Define qty, weight, volume, weight_units, volume_units
if ($this->element == 'shipping') $qty=$line->qty_shipped; // for shipments
@@ -3034,8 +3041,11 @@ abstract class CommonObject
if (! empty($weight_units)) $weightUnit = $weight_units;
if (! empty($volume_units)) $volumeUnit = $volume_units;
+ if (empty($totalWeight)) $totalWeight=0; // Avoid warning because $totalWeight is ''
+ if (empty($totalVolume)) $totalVolume=0; // Avoid warning because $totalVolume is ''
+
//var_dump($line->volume_units);
- if ($weight_units < 50) // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+ if ($weight_units < 50) // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
{
$trueWeightUnit=pow(10, $weightUnit);
$totalWeight += $weight * $qty * $trueWeightUnit;
@@ -3044,7 +3054,7 @@ abstract class CommonObject
{
$totalWeight += $weight * $qty; // This may be wrong if we mix different units
}
- if ($volume_units < 50) // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+ if ($volume_units < 50) // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
{
//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
$trueVolumeUnit=pow(10, $volumeUnit);
--
GitLab