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

Merge pull request #21480 from atm-jpb/13.0_fix_massaction_create_invoice_on_multiorders

Browse Source 
FIX : rank duplicate on mass action invoice from multiple orders
This commit is contained in:
Laurent Destailleur 2022-07-10 18:43:36 +02:00 committed by GitHub
commit fcbe09b790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/actions_massactions.inc.php
View File

@ -605,6 +605,8 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
$db->begin(); $db->begin();
$nbOrders = is_array($orders) ? count($orders) : 1;
foreach ($orders as $id_order) foreach ($orders as $id_order)
{ {
$cmd = new Commande($db); $cmd = new Commande($db);
@ -726,7 +728,7 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
$lines[$i]->fetch_optionals(); $lines[$i]->fetch_optionals();
$array_options = $lines[$i]->array_options; $array_options = $lines[$i]->array_options;
} }
$rankedLine = ($nbOrders > 1) ? -1 : $lines[$i]->rang;
$result = $objecttmp->addline( $result = $objecttmp->addline(
$desc, $desc,
$lines[$i]->subprice, $lines[$i]->subprice,
@ -744,7 +746,7 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
'HT', 'HT',
0, 0,
$product_type, $product_type,
$lines[$i]->rang, $rankedLine,
$lines[$i]->special_code, $lines[$i]->special_code,
$objecttmp->origin, $objecttmp->origin,
$lines[$i]->rowid, $lines[$i]->rowid,