2
0
forked from Wavyzz/dolibarr

Fix: regression

This commit is contained in:
Regis Houssin
2010-09-06 22:31:36 +00:00
parent 8f04e216db
commit f4e656eee1
13 changed files with 74 additions and 373 deletions

View File

@@ -136,7 +136,6 @@ if ($_REQUEST['action'] == 'confirm_delete' && $_REQUEST['confirm'] == 'yes')
$commande = new Commande($db);
$commande->fetch($comid);
$result=$commande->delete($user);
if ($result > 0)
{
Header('Location: index.php');
@@ -161,9 +160,6 @@ if ($_REQUEST['action'] == 'confirm_deleteline' && $_REQUEST['confirm'] == 'yes'
$result = $commande->delete_line($_GET['lineid']);
if ($result > 0)
{
// reorder lines
$commande->line_order(true);
// Define output language
$outputlangs = $langs;
$newlang='';
@@ -1801,7 +1797,7 @@ else
}
else
{*/
print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/shipment.php?id='.$commande->id.'">'.$langs->trans('ShipProduct').'</a>';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/shipment.php?id='.$comid.'">'.$langs->trans('ShipProduct').'</a>';
//}
}
else