Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

This commit is contained in:
Laurent Destailleur 2020-12-04 19:12:22 +01:00
commit c1b6e58bbd

View File

@ -865,7 +865,7 @@ class Product extends CommonObject
$this->surface = $this->length * $this->width;
$this->surface_units = measuring_units_squared($this->length_units);
}
if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units) {
if (empty($this->volume) && !empty($this->surface) && !empty($this->height) && $this->length_units == $this->height_units) {
$this->volume = $this->surface * $this->height;
$this->volume_units = measuring_units_cubed($this->height_units);
}