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

Merge pull request #19535 from Hystepik/develop#4

Browse Source 
Fix : php 8.0 warnings
This commit is contained in:
Laurent Destailleur
2021-12-08 18:44:16 +01:00
committed by GitHub
parent 919f80ee86 ed7bfb333b
commit ea45fdce5c
7 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4488,14 +4488,14 @@ abstract class CommonObject
$qty = $line->qty ? $line->qty : 0;
}
$weight = $line->weight ? $line->weight : 0;
$weight = !empty($line->weight) ? $line->weight : 0;
($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;
$volume = $line->volume ? $line->volume : 0;
$volume = !empty($line->volume) ? $line->volume : 0;
($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;
$weight_units = $line->weight_units;
$weight_units = !empty($line->weight_units) ? $line->weight_units : 0;
($weight_units == 0 && !empty($line->product->weight_units)) ? $weight_units = $line->product->weight_units : 0;
$volume_units = $line->volume_units;
$volume_units = !empty($line->volume_units) ? $line->volume_units : 0;
($volume_units == 0 && !empty($line->product->volume_units)) ? $volume_units = $line->product->volume_units : 0;
$weightUnit = 0;