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

New: Use new confirm box for delivery receipts.

Browse Source 
New: Can delete a validated delivery receipt
This commit is contained in:
Laurent Destailleur 2009-07-15 20:10:28 +00:00
parent 54da829a83
commit 085d564144
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
htdocs/livraison/fiche.php
View File

@ -23,7 +23,7 @@
/** /**
* \file htdocs/livraison/fiche.php * \file htdocs/livraison/fiche.php
* \ingroup livraison * \ingroup livraison
* \brief Fiche descriptive d'un bon de livraison * \brief Fiche descriptive d'un bon de livraison=reception
* \version $Id$ * \version $Id$
*/ */
@ -98,7 +98,7 @@ if ($_POST["action"] == 'add')
} }
} }
if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user->rights->expedition->livraison->valider) if ($_REQUEST["action"] == 'confirm_valid' && $_REQUEST["confirm"] == 'yes' && $user->rights->expedition->livraison->valider)
{ {
$livraison = new Livraison($db); $livraison = new Livraison($db);
$livraison->fetch($_GET["id"]); $livraison->fetch($_GET["id"]);
@ -106,14 +106,18 @@ if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user->
//$livraison->PdfWrite(); //$livraison->PdfWrite();
} }
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->expedition->livraison->supprimer)
{ {
if ($user->rights->expedition->livraison->supprimer ) $livraison = new Livraison($db);
$livraison->fetch($_GET["id"]);
$expedition_id = $livraison->expedition_id;
$db->begin();
$result=$livraison->delete();
if ($result > 0)
{ {
$livraison = new Livraison($db); $db->commit();
$livraison->fetch($_GET["id"]);
$expedition_id = $_GET["expid"];
$livraison->delete();
if ($conf->expedition_bon->enabled) if ($conf->expedition_bon->enabled)
{ {
Header("Location: ".DOL_URL_ROOT.'/expedition/fiche.php?id='.$expedition_id); Header("Location: ".DOL_URL_ROOT.'/expedition/fiche.php?id='.$expedition_id);
@ -124,6 +128,10 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
} }
exit; exit;
} }
else
{
$db->rollback();
}
} }
/* /*
@ -396,7 +404,7 @@ else
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
{ {
$expedition_id = $_GET["expid"]; $expedition_id = $_GET["expid"];
$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$livraison->id.'&expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm"),'confirm_delete'); $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$livraison->id.'&expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm"),'confirm_delete','','',1);
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';
} }
@ -406,7 +414,7 @@ else
*/ */
if ($_GET["action"] == 'valid') if ($_GET["action"] == 'valid')
{ {
$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$livraison->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm"),'confirm_valid'); $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$livraison->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm"),'confirm_valid','','',1);
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';
} }
@ -552,14 +560,14 @@ else
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if (! eregi('^(valid|delete)',$_REQUEST["action"])) // if (! eregi('^(valid|delete)',$_REQUEST["action"]))
{ // {
if ($livraison->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0) if ($livraison->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0)
{ {
print '<a class="butAction" href="fiche.php?id='.$livraison->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>'; print '<a class="butAction" href="fiche.php?id='.$livraison->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
} }
if ($livraison->brouillon && $user->rights->expedition->livraison->supprimer) if ($user->rights->expedition->livraison->supprimer)
{ {
if ($conf->expedition_bon->enabled) if ($conf->expedition_bon->enabled)
{ {
@ -570,7 +578,7 @@ else
print '<a class="butActionDelete" href="fiche.php?id='.$livraison->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>'; print '<a class="butActionDelete" href="fiche.php?id='.$livraison->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
} }
} }
} // }
print '</div>'; print '</div>';
} }
@ -604,14 +612,14 @@ else
} }
else else
{ {
/* Expedition non trouv<EFBFBD>e */ /* Expedition non trouvee */
print "Expedition inexistante ou acc<EFBFBD>s refus<75>"; print "Expedition inexistante ou acces refuse";
} }
} }
else else
{ {
/* Expedition non trouv<EFBFBD>e */ /* Expedition non trouvee */
print "Expedition inexistante ou acc<EFBFBD>s refus<75>"; print "Expedition inexistante ou acces refuse";
} }
} }

2
htdocs/livraison/livraison.class.php
View File

@ -51,6 +51,8 @@ class Livraison extends CommonObject
var $origin_id; var $origin_id;
var $socid; var $socid;
var $expedition_id;
var $date_livraison; var $date_livraison;
var $date_creation; var $date_creation;
var $date_valid; var $date_valid;