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

Merge pull request #20274 from altairis-noe/mass_action_ship_orders

Browse Source 
FIX: Mass action ship orders
This commit is contained in:
Laurent Destailleur 2022-03-25 15:15:12 +01:00 committed by GitHub
commit 446ee8dc3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/commande/list.php
View File

@ -337,15 +337,15 @@ if ($action == 'shipped' && $permissiontoadd) {
$error = 0; $error = 0;
foreach ($toselect as $checked) { foreach ($toselect as $checked) {
if ($objecttmp->fetch($checked)) { if ($objecttmp->fetch($checked)) {
if ($objecttmp->statut == 1) { if ($objecttmp->statut == 1 || $objecttmp->statut == 2) {
if ($objecttmp->cloture($user)) { if ($objecttmp->cloture($user)) {
setEventMessage($objecttmp->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs'); setEventMessage($objecttmp->ref." ".$langs->trans('PassedInShippedStatus'), 'mesgs');
} else { } else {
setEventMessage($langs->trans('CantBeValidated'), 'errors'); setEventMessage($langs->trans('YouCantShipThis'), 'errors');
$error++; $error++;
} }
} else { } else {
setEventMessage($objecttmp->ref." ".$langs->trans('IsNotADraft'), 'errors'); setEventMessage($objecttmp->ref." ".$langs->trans('MustBeValidatedBefore'), 'errors');
$error++; $error++;
} }
} else { } else {

3
htdocs/langs/en_US/orders.lang
View File

@ -102,6 +102,9 @@ ConfirmCancelOrder=Are you sure you want to cancel this order?
ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>? ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
GenerateBill=Generate invoice GenerateBill=Generate invoice
ClassifyShipped=Classify delivered ClassifyShipped=Classify delivered
PassedInShippedStatus=classified delivered
YouCantShipThis=I can't classify this. Please check user permissions
MustBeValidatedBefore=must be Validated or In process in order to be classified as shipped
DraftOrders=Draft orders DraftOrders=Draft orders
DraftSuppliersOrders=Draft purchase orders DraftSuppliersOrders=Draft purchase orders
OnProcessOrders=In process orders OnProcessOrders=In process orders

3
htdocs/langs/fr_FR/orders.lang
View File

@ -102,6 +102,9 @@ ConfirmCancelOrder=Êtes-vous sûr de vouloir annuler cette commande ?
ConfirmMakeOrder=Êtes-vous sûr de vouloir confirmer cette commande en date du <b>%s</b> ? ConfirmMakeOrder=Êtes-vous sûr de vouloir confirmer cette commande en date du <b>%s</b> ?
GenerateBill=Facturer GenerateBill=Facturer
ClassifyShipped=Classer livrée ClassifyShipped=Classer livrée
PassedInShippedStatus=classée livrée
YouCantShipThis=Classement impossible : veuillez vérifier les droits utilisateur
MustBeValidatedBefore=doit être Validée ou En cours de livraison pour pouvoir être classée livrée
DraftOrders=Commandes brouillons DraftOrders=Commandes brouillons
DraftSuppliersOrders=Commandes fournisseurs brouillons DraftSuppliersOrders=Commandes fournisseurs brouillons
OnProcessOrders=Commandes en cours de traitement OnProcessOrders=Commandes en cours de traitement