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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-31 15:53:19 +02:00
commit 5d8c7d2f0b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/expedition/card.php
View File

@ -1461,6 +1461,10 @@ if ($action == 'create') {
} }
foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) { 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); $tmpwarehouseObject->fetch($warehouse_id);
if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) { if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
foreach ($stock_warehouse->detail_batch as $dbatch) { foreach ($stock_warehouse->detail_batch as $dbatch) {

2
htdocs/reception/card.php
View File

@ -1458,7 +1458,7 @@ if ($action == 'create') {
// Date creation // Date creation
print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour")."</td>\n"; print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour", "tzuserrel")."</td>\n";
print '</tr>'; print '</tr>';
// Delivery date planned // Delivery date planned