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

add verification on batchcode

Browse Source
This commit is contained in:
hystepik 2023-05-09 15:37:49 +02:00
parent 1b75dc54b4
commit 2b2b722ead
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/expedition/dispatch.php
View File

@ -164,6 +164,29 @@ if ($action == 'updatelines' && $usercancreate) {
setEventMessages($langs->trans('ErrorFieldRequired', $text), null, 'errors');
$error++;
}
if ($modebatch == "batch") {
$sql = "SELECT pb.rowid ";
$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
$sql .= " JOIN ".MAIN_DB_PREFIX."product_stock as ps";
$sql .= " ON ps.rowid = pb.fk_product_stock";
$sql .= " WHERE pb.batch ='".$db->escape($lot)."'";
$sql .= " AND ps.fk_product =".((int) GETPOST($prod, 'int')) ;
$sql .= " AND ps.fk_entrepot =".((int) GETPOST($ent, 'int')) ;
$resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
if ($num > 1) {
dol_syslog('No dispatch for line '.$key.' as too many combination warehouse, product, batch code was found ('.$num.').');
setEventMessages($langs->trans('ErrorTooManyCombinationBatchcode', $numline, $num), null, 'errors');
$error++;
} elseif ($num < 1) {
dol_syslog('No dispatch for line '.$key.' as no combination warehouse, product, batch code was found.');
setEventMessages($langs->trans('ErrorNoCombinationBatchcode', $numline), null, 'errors');
$error++;
}
$db->free($resql);
}
}
if (!$error) {
$qtystart = 0;
@ -686,9 +709,9 @@ if ($id > 0 || !empty($ref)) {
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
$sql .= " WHERE cfd.fk_commandefourndet = ".(int) $objp->rowid;*/
$sql = "SELECT ed.rowid, ed.qty, ed.fk_entrepot, eb.batch, eb.eatby, eb.sellby, cd.fk_product FROM llx_expeditiondet as ed";
$sql .= " LEFT JOIN llx_expeditiondet_batch as eb on ed.rowid = eb.fk_expeditiondet";
$sql .= " JOIN llx_commandedet as cd on ed.fk_origin_line = cd.rowid";
$sql = "SELECT ed.rowid, ed.qty, ed.fk_entrepot, eb.batch, eb.eatby, eb.sellby, cd.fk_product FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as eb on ed.rowid = eb.fk_expeditiondet";
$sql .= " JOIN ".MAIN_DB_PREFIX."commandedet as cd on ed.fk_origin_line = cd.rowid";
$sql .= " WHERE ed.fk_origin_line =".(int) $objp->rowid;
$sql .= " AND ed.fk_expedition =".(int) $object->id;
$sql .= " ORDER BY ed.rowid, ed.fk_origin_line";

5
htdocs/langs/en_US/sendings.lang
View File

@ -76,4 +76,7 @@ DetailWarehouseNumber= Warehouse details
DetailWarehouseFormat= W:%s (Qty: %d)
# Other
DispatchCard = Dispatch card
DispatchCard = Dispatch card
ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.