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

FIX selectFields for GROUP BY and show only if units defined

Browse Source
This commit is contained in:
VESSILLER 2019-09-17 10:05:35 +02:00
parent 555ea977c9
commit 3654a5d01c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/class/html.form.class.php
View File

@ -2120,7 +2120,7 @@ class Form
// Units // Units
if (! empty($conf->global->PRODUCT_USE_UNITS)) { if (! empty($conf->global->PRODUCT_USE_UNITS)) {
$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units"; $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
$selectFields .= ', unit_long, unit_short'; $selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
} }
// Multilang : we add translation // Multilang : we add translation
@ -2419,19 +2419,19 @@ class Form
if (!empty($objp->unit_short)) { if (!empty($objp->unit_short)) {
$outvalUnits .= ' - ' . $objp->unit_short; $outvalUnits .= ' - ' . $objp->unit_short;
} }
if (!empty($objp->weight)) { if (!empty($objp->weight) && $objp->weight_units!==null) {
$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs); $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }
if (!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) { if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units!==null) {
$unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuring_units_string($objp->length_units, 'size'); $unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuring_units_string($objp->length_units, 'size');
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }
if (!empty($objp->surface)) { if (!empty($objp->surface) && $objp->surface_units!==null) {
$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs); $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }
if (!empty($objp->volume)) { if (!empty($objp->volume) && $objp->volume_units!==null) {
$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs); $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }
@ -2796,19 +2796,19 @@ class Form
if (!empty($objp->unit_short)) { if (!empty($objp->unit_short)) {
$outvalUnits .= ' - ' . $objp->unit_short; $outvalUnits .= ' - ' . $objp->unit_short;
} }
if (!empty($objp->weight)) { if (!empty($objp->weight) && $objp->weight_units!==null) {
$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs); $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }
if (!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) { if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units!==null) {
$unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuring_units_string($objp->length_units, 'size'); $unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuring_units_string($objp->length_units, 'size');
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }
if (!empty($objp->surface)) { if (!empty($objp->surface) && $objp->surface_units!==null) {
$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs); $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }
if (!empty($objp->volume)) { if (!empty($objp->volume) && $objp->volume_units!==null) {
$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs); $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
$outvalUnits .= ' - ' . $unitToShow; $outvalUnits .= ' - ' . $unitToShow;
} }