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

Fix delete multi warehouse line

Browse Source
This commit is contained in:
fappels 2017-10-24 11:37:17 +02:00
parent 7f7e621ea9
commit 0c38944daa
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/expedition/card.php
View File

@ -612,28 +612,30 @@ if (empty($reshook))
$num_prod = count($lines); $num_prod = count($lines);
for ($i = 0 ; $i < $num_prod ; $i++) for ($i = 0 ; $i < $num_prod ; $i++)
{ {
if (count($lines[$i]->details_entrepot) > 1) if ($lines[$i]->id == $line_id)
{ {
// delete multi warehouse lines if (count($lines[$i]->details_entrepot) > 1)
foreach ($lines[$i]->details_entrepot as $details_entrepot) { {
$line->id = GETPOST("lineid".$details_entrepot->line_id); // delete multi warehouse lines
if (!error && $line->delete($user) < 0) foreach ($lines[$i]->details_entrepot as $details_entrepot) {
$line->id = $details_entrepot->line_id;
if (! $error && $line->delete($user) < 0)
{
$error++;
}
}
}
else
{
// delete single warehouse line
$line->id = $line_id;
if (! $error && $line->delete($user) < 0)
{ {
$error++; $error++;
} }
unset($_POST["lineid".$details_entrepot->line_id]);
} }
} }
else if ($lines[$i] == $line_id) unset($_POST["lineid"]);
{
// delete single warehouse line
$line->id = $line_id;
if (!error && $line->delete($user) < 0)
{
$error++;
}
unset($_POST["lineid"]);
}
} }
if(! $error) { if(! $error) {
@ -2223,7 +2225,6 @@ else if ($id || $ref)
$entrepot = new Entrepot($db); $entrepot = new Entrepot($db);
$entrepot->fetch($detail_entrepot->entrepot_id); $entrepot->fetch($detail_entrepot->entrepot_id);
$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>'; $detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
print '<input name="lineid'.$detail_entrepot->line_id.'" id="lineid'.$detail_entrepot->line_id.'" type="hidden" value="'.$detail_entrepot->line_id.'">';
} }
} }
print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail); print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);