diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 03595b022a5..d16885faa0f 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1461,6 +1461,10 @@ if ($action == 'create') { } foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) { + if (!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)) { + // if a warehouse was selected by user, picking is limited to this warehouse and his children. + continue; + } $tmpwarehouseObject->fetch($warehouse_id); if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) { foreach ($stock_warehouse->detail_batch as $dbatch) { diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 9e4cb346398..07019355513 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1458,7 +1458,7 @@ if ($action == 'create') { // Date creation print ''.$langs->trans("DateCreation").''; - print ''.dol_print_date($object->date_creation, "dayhour")."\n"; + print ''.dol_print_date($object->date_creation, "dayhour", "tzuserrel")."\n"; print ''; // Delivery date planned