Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix php8 error

Browse Source
This commit is contained in:
Laurent Destailleur 2023-10-16 21:35:00 +02:00
parent 01a139158d
commit 2fdf26731b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/expedition/card.php
View File

@ -1414,7 +1414,9 @@ if ($action == 'create') {
}
$subj++;
print '</td>';
if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td>'.dol_print_date($dbatch->stock_entry_date, 'day').'</td>'; //StockEntrydate
if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
print '<td>'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>'; //StockEntrydate
}
print '</tr>';
}
} else {
@ -1426,7 +1428,7 @@ if ($action == 'create') {
print '<td class="left">';
print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label);
print '</td>';
if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate
if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>'; //StockEntrydate
print '</tr>';
}
}
@ -1639,7 +1641,9 @@ if ($action == 'create') {
//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
$subj++;
print '</td>';
if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td class="left">'.dol_print_date($dbatch->stock_entry_date, 'day').'</td>';
if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) {
print '<td class="left">'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>';
}
print '</tr>';
}
}

5
htdocs/product/class/productbatch.class.php
View File

@ -500,7 +500,8 @@ class Productbatch extends CommonObject
$tmp->batch = $obj->batch;
$tmp->qty = $obj->qty;
$tmp->import_key = $obj->import_key;
$tmp->stock_entry_date = $obj->date_entree;
$tmp->context['stock_date_entry'] = $obj->date_entree;
// Some properties of the lot
$tmp->lotid = $obj->lotid; // ID in table of the details of properties of each lots
@ -514,7 +515,7 @@ class Productbatch extends CommonObject
return $ret;
} else {
$error = "Error ".$dbs->lasterror();
//$error = "Error ".$dbs->lasterror();
return -1;
}
}