|
@@ -364,7 +364,7 @@ if (empty($reshook)) {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && !empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))) {
|
|
|
+ if (GETPOST($qty, 'int') > 0 || !empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
|
|
|
$ent = "entl".$i;
|
|
|
$idl = "idl".$i;
|
|
|
$entrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
|
|
@@ -375,7 +375,7 @@ if (empty($reshook)) {
|
|
|
$entrepot_id = 0;
|
|
|
}
|
|
|
|
|
|
- $ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOSTINT($qty), $array_options[$i]);
|
|
|
+ $ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), price2num(GETPOST($qty, 'alpha'), 'MS'), $array_options[$i]);
|
|
|
if ($ret < 0) {
|
|
|
setEventMessages($object->error, $object->errors, 'errors');
|
|
|
$error++;
|