diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ea94e76a84d..2e8ca8540d5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -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;
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 64a080e8f6e..fe09a4c521d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2103,7 +2103,7 @@ if ($action == 'create') {
// Loop on each product to send/sent
for ($i = 0; $i < $num_prod; $i++) {
- $parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => $editColspan, 'outputlangs' => $outputlangs);
+ $parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => !empty($editColspan) ? $editColspan : 0, 'outputlangs' => !empty($outputlangs) ? $outputlangs: '');
$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -2143,10 +2143,10 @@ if ($action == 'create') {
$product_static->weight_units = $lines[$i]->weight_units;
$product_static->length = $lines[$i]->length;
$product_static->length_units = $lines[$i]->length_units;
- $product_static->width = $lines[$i]->width;
- $product_static->width_units = $lines[$i]->width_units;
- $product_static->height = $lines[$i]->height;
- $product_static->height_units = $lines[$i]->height_units;
+ $product_static->width = !empty($lines[$i]->width) ? $lines[$i]->width : 0;
+ $product_static->width_units = !empty($lines[$i]->width_units) ? $lines[$i]->width_units : 0;
+ $product_static->height = !empty($lines[$i]->height) ? $lines[$i]->height : 0;
+ $product_static->height_units = !empty($lines[$i]->height_units) ? $lines[$i]->height_units : 0;
$product_static->surface = $lines[$i]->surface;
$product_static->surface_units = $lines[$i]->surface_units;
$product_static->volume = $lines[$i]->volume;
@@ -2156,7 +2156,7 @@ if ($action == 'create') {
$text .= ' - '.$label;
$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($lines[$i]->description));
print $form->textwithtooltip($text, $description, 3, '', '', $i);
- print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
+ print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '
'.dol_htmlentitiesbr($lines[$i]->description) : '';
}
@@ -2181,7 +2181,7 @@ if ($action == 'create') {
}
$unit_order = '';
- if ($conf->global->PRODUCT_USE_UNITS) {
+ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$unit_order = measuringUnitString($lines[$i]->fk_unit);
}
@@ -2412,9 +2412,9 @@ if ($action == 'create') {
// TODO Show all in same line by setting $display_type = 'line'
if ($action == 'editline' && $line->id == $line_id) {
- print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked, '', 0, 'card');
+ print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
} else {
- print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked, '', 0, 'card');
+ print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
}
}
}
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 5b8727a3f0c..c636cfb7b19 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -85,6 +85,7 @@ if (empty($origin_id)) {
}
$ref = GETPOST('ref', 'alpha');
$line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
+$facid = GETPOST('facid', 'int');
$action = GETPOST('action', 'alpha');
//Select mail models is same action as presend
@@ -1750,7 +1751,7 @@ if ($action == 'create') {
// Loop on each product to send/sent
for ($i = 0; $i < $num_prod; $i++) {
- print ''; // id of order line
+ print ''; // id of order line
print '