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

Add delete line to expedition card

Browse Source
This commit is contained in:
fappels 2017-10-18 18:18:17 +02:00
parent 2ea687a60b
commit 146f17faa6
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/expedition/card.php
View File

@ -69,6 +69,7 @@ $id = $origin_id;
if (empty($origin_id)) $origin_id = GETPOST('origin_id','int'); // Id of order or propal if (empty($origin_id)) $origin_id = GETPOST('origin_id','int'); // Id of order or propal
if (empty($origin_id)) $origin_id = GETPOST('object_id','int'); // Id of order or propal if (empty($origin_id)) $origin_id = GETPOST('object_id','int'); // Id of order or propal
$ref=GETPOST('ref','alpha'); $ref=GETPOST('ref','alpha');
$line_id = GETPOST('lineid','int')?GETPOST('lineid','int'):'';
// Security check // Security check
$socid=''; $socid='';
@ -596,6 +597,18 @@ if (empty($reshook))
} }
} }
elseif ($action == 'deleteline' && ! empty($line_id))
{
$object->fetch($id);
$line = new ExpeditionLigne($db);
$line->id = $line_id;
$result = $line->delete($user);
if($result >= 0) {
header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
exit();
}
}
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
// Actions to send emails // Actions to send emails
@ -1769,6 +1782,8 @@ else if ($id || $ref)
print '<td align="left">'.$langs->trans("Batch").'</td>'; print '<td align="left">'.$langs->trans("Batch").'</td>';
} }
print '<td class="linecoledit"></td>';
print '<td class="linecoldelete" width="10"></td>';
print "</tr>\n"; print "</tr>\n";
$var=false; $var=false;
@ -1992,6 +2007,18 @@ else if ($id || $ref)
print '<td></td>'; print '<td></td>';
} }
} }
// edit-delete buttons
print '<td class="linecoledit" align="center">';
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">';
print img_edit();
print '</a>';
print '</td>';
print '<td class="linecoldelete" width="10">';
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">';
print img_delete();
print '</a>';
print '</td>';
print "</tr>"; print "</tr>";
// Display lines extrafields // Display lines extrafields
@ -2003,8 +2030,6 @@ else if ($id || $ref)
print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked); print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
print '</tr>'; print '</tr>';
} }
} }
// TODO Show also lines ordered but not delivered // TODO Show also lines ordered but not delivered