Tache 6462: Ajout message confirmation sur suppression ligne écriture bancaire
This commit is contained in:
parent
7157133ff6
commit
3a694a2a8d
@ -48,7 +48,7 @@ $page=isset($_GET["page"])?$_GET["page"]:0;
|
|||||||
* Action
|
* Action
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]))
|
if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user->rights->banque->modifier)
|
||||||
{
|
{
|
||||||
if ($_POST["credit"] > 0)
|
if ($_POST["credit"] > 0)
|
||||||
{
|
{
|
||||||
@ -79,10 +79,11 @@ if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]))
|
|||||||
dolibarr_print_error($db,$acct->error);
|
dolibarr_print_error($db,$acct->error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($_GET["action"] == 'del' && $account && $user->rights->banque->modifier)
|
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"]=='yes' && $user->rights->banque->modifier)
|
||||||
{
|
{
|
||||||
$acct=new Account($db,$account);
|
$acct=new Account($db);
|
||||||
$acct->deleteline($_GET["rowid"]);
|
$acct->id=$account;
|
||||||
|
$result=$acct->deleteline($_GET["rowid"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -92,6 +93,8 @@ if ($_GET["action"] == 'del' && $account && $user->rights->banque->modifier)
|
|||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
|
$html = new Form($db);
|
||||||
|
|
||||||
if ($account > 0)
|
if ($account > 0)
|
||||||
{
|
{
|
||||||
if ($vline)
|
if ($vline)
|
||||||
@ -185,9 +188,14 @@ if ($account > 0)
|
|||||||
$limitsql = $nbline;
|
$limitsql = $nbline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Onglets
|
||||||
|
$head=bank_prepare_head($acct);
|
||||||
|
dolibarr_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Formulaire de recherche
|
* Bandeau recherche
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
$mesg='';
|
$mesg='';
|
||||||
|
|
||||||
@ -201,20 +209,23 @@ if ($account > 0)
|
|||||||
{
|
{
|
||||||
$mesg.= '<a href="account.php?account='.$acct->id.'&page='.($page-1).'">'.img_next().'</a>';
|
$mesg.= '<a href="account.php?account='.$acct->id.'&page='.($page-1).'">'.img_next().'</a>';
|
||||||
}
|
}
|
||||||
|
if (! $_GET["action"]=='addline' && ! $_GET["action"]=='delete')
|
||||||
|
|
||||||
// Onglets
|
|
||||||
$head=bank_prepare_head($acct);
|
|
||||||
dolibarr_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0);
|
|
||||||
|
|
||||||
if (! $_GET["action"]=='addline')
|
|
||||||
{
|
{
|
||||||
$titre=$langs->trans("FinancialAccount")." : ".$acct->label;
|
$titre=$langs->trans("FinancialAccount")." : ".$acct->label;
|
||||||
print_fiche_titre($titre,$mesg);
|
print_fiche_titre($titre,$mesg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($_GET["action"]=='delete')
|
||||||
|
{
|
||||||
|
$text=$langs->trans('ConfirmDeleteTransaction');
|
||||||
|
$html->form_confirm($_SERVER['PHP_SELF'].'?account='.$acct->id.'&rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete');
|
||||||
|
print '<br />';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
print '<table class="notopnoleftnoright" width="100%">';
|
print '<table class="notopnoleftnoright" width="100%">';
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Affiche tableau des transactions bancaires
|
* Affiche tableau des transactions bancaires
|
||||||
*
|
*
|
||||||
@ -335,7 +346,7 @@ if ($account > 0)
|
|||||||
/*
|
/*
|
||||||
* Boutons actions
|
* Boutons actions
|
||||||
*/
|
*/
|
||||||
if ($_GET["action"] != 'addline')
|
if ($_GET["action"] != 'addline' && $_GET["action"] != 'delete')
|
||||||
{
|
{
|
||||||
print '<div class="tabsAction">';
|
print '<div class="tabsAction">';
|
||||||
|
|
||||||
@ -502,7 +513,7 @@ function _print_lines($db,$result,$sql,$acct)
|
|||||||
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
||||||
print img_edit();
|
print img_edit();
|
||||||
print '</a> ';
|
print '</a> ';
|
||||||
print '<a href="account.php?action=del&rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?action=delete&rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
||||||
print img_delete();
|
print img_delete();
|
||||||
print '</a></td>';
|
print '</a></td>';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -96,3 +96,5 @@ TransferDesc=Transfer from one account to another one, Dolibarr will write two r
|
|||||||
TransferFrom=From
|
TransferFrom=From
|
||||||
TransferTo=To
|
TransferTo=To
|
||||||
CheckTransmitter=Transmitter
|
CheckTransmitter=Transmitter
|
||||||
|
DeleteTransaction=Delete transaction
|
||||||
|
ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?
|
||||||
|
|||||||
@ -100,3 +100,5 @@ ValidateCheckReceipt=Valider ce bordereau de remise ?
|
|||||||
DeleteCheckReceipt=Supprimer ce bordereau de remise ?
|
DeleteCheckReceipt=Supprimer ce bordereau de remise ?
|
||||||
BankChecks=Chèques
|
BankChecks=Chèques
|
||||||
BankChecksToReceipt=Chèques à déposer
|
BankChecksToReceipt=Chèques à déposer
|
||||||
|
DeleteTransaction=Supprimer la transaction
|
||||||
|
ConfirmDeleteTransaction=Etes Vous sur de vouloir supprimer cette transaction ?
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user