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

better check for unicity

Browse Source
This commit is contained in:
Christophe Battarel 2021-03-05 08:39:30 +01:00
parent 863ba52b15
commit acea36acf2
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/productbatch.lang
View File

@ -25,4 +25,4 @@ ShowCurrentStockOfLot=Show current stock for couple product/lot
ShowLogOfMovementIfLot=Show log of movements for couple product/lot ShowLogOfMovementIfLot=Show log of movements for couple product/lot
StockDetailPerBatch=Stock detail per lot StockDetailPerBatch=Stock detail per lot
SerialNumberAlreadyInUse=Serial number %s is already used for product %s SerialNumberAlreadyInUse=Serial number %s is already used for product %s
TooManyQtyForSerialNumber=You can only have one product %s for serial number %S

2
htdocs/langs/fr_FR/productbatch.lang
View File

@ -25,4 +25,4 @@ ShowCurrentStockOfLot=Afficher le stock actuel pour le couple produit / lot
ShowLogOfMovementIfLot=Afficher l'historique des mouvements de couple produit / lot ShowLogOfMovementIfLot=Afficher l'historique des mouvements de couple produit / lot
StockDetailPerBatch=Stock détaillé par lot StockDetailPerBatch=Stock détaillé par lot
SerialNumberAlreadyInUse=Le numéro de série %s est déjà utilisé pour le produit %s SerialNumberAlreadyInUse=Le numéro de série %s est déjà utilisé pour le produit %s
TooManyQtyForSerialNumber=Vous ne pouvez avoir qu'un produit %s avec le numéro de série %s

10
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -569,11 +569,19 @@ class MouvementStock extends CommonObject
if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
{ {
// check unicity for serial numbered equipments ( different for lots managed products) // check unicity for serial numbered equipments ( different for lots managed products)
if ( $product->status_batch == 2 && $qty > 0 && $this->getBatchCount($fk_product, $batch) > 0 ) if ( $product->status_batch == 2 && $qty > 0 )
{
if ( $this->getBatchCount($fk_product, $batch) > 0 )
{ {
$error++; $error++;
$this->errors[] = $langs->trans("SerialNumberAlreadyInUse", $batch, $product->ref); $this->errors[] = $langs->trans("SerialNumberAlreadyInUse", $batch, $product->ref);
} }
elseif { $qty > 1 }
{
$error++;
$this->errors[] = $langs->trans("TooManyQtyForSerialNumber", $product->ref, $batch);
}
}
if ( ! $error ) if ( ! $error )
{ {