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

Gestion suppression et validation

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2006-12-21 14:52:14 +00:00
parent 38a05f1551
commit 7eff311963
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
htdocs/compta/paiement/cheque/fiche.php
View File

@ -51,7 +51,7 @@ if ($_GET['action'] == 'create' && $_GET["accountid"] > 0 && $user->rights->banq
$result = $remise->Create($user, $_GET["accountid"]); $result = $remise->Create($user, $_GET["accountid"]);
if ($result === 0) if ($result === 0)
{ {
Header("Location: index.php"); Header("Location: fiche.php?id=".$remise->id);
exit; exit;
} }
else else
@ -67,7 +67,8 @@ if ($_GET['action'] == 'remove' && $_GET["id"] > 0 && $_GET["lineid"] > 0 && $us
$result = $remise->RemoveCheck($_GET["lineid"]); $result = $remise->RemoveCheck($_GET["lineid"]);
if ($result === 0) if ($result === 0)
{ {
Header("Location: fiche.php?id=".$remise->id);
exit;
} }
else else
{ {
@ -91,6 +92,21 @@ if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes' && $user-
} }
} }
if ($_POST['action'] == 'confirm_valide' && $_POST['confirm'] == 'yes' && $user->rights->banque)
{
$remise = new RemiseCheque($db);
$remise->id = $_GET["id"];
$result = $remise->Validate($user);
if ($result == 0)
{
Header("Location: fiche.php?id=".$remise->id);
exit;
}
else
{
$mesg='<div class="error">'.$paiement->error.'</div>';
}
}
/* /*
* Visualisation de la fiche * Visualisation de la fiche
@ -142,7 +158,7 @@ else
if ($_GET['action'] == 'valide') if ($_GET['action'] == 'valide')
{ {
$facid = $_GET['facid']; $facid = $_GET['facid'];
$html->form_confirm('fiche.php?id='.$paiement->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), 'Etes-vous sûr de vouloir valider ce règlement, auncune modification n\'est possible une fois le règlement validé ?', 'confirm_valide'); $html->form_confirm('fiche.php?id='.$remise->id, $langs->trans("ValidateCheckReceipt"), 'Etes-vous sûr de vouloir valider ce bordereau, auncune modification n\'est possible une fois le bordereau validé ?', 'confirm_valide');
print '<br>'; print '<br>';
} }
} }
@ -158,6 +174,12 @@ if ($_GET['action'] == 'new')
{ {
$accounts = array(); $accounts = array();
$lines = array(); $lines = array();
print '<table class="border" width="100%">';
print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dolibarr_print_date(time()).'</td></tr>';
print '</table><br />';
$sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,"; $sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,";
$sql.= " b.amount, ba.label, b.emetteur"; $sql.= " b.amount, ba.label, b.emetteur";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b "; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b ";
@ -231,7 +253,7 @@ else
print '</table><br />'; print '</table><br />';
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount,b.banque,b.emetteur,"; $sql = "SELECT b.rowid,".$db->pdate("p.datep")." as dp, p.amount,b.banque,b.emetteur,";
$sql.= " p.statut, p.num_paiement,"; $sql.= " p.statut, p.num_paiement,";
$sql.= " c.code as paiement_code,"; $sql.= " c.code as paiement_code,";
$sql.= " ba.rowid as bid, ba.label"; $sql.= " ba.rowid as bid, ba.label";
@ -250,7 +272,6 @@ else
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$total = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield); print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield);
@ -258,7 +279,7 @@ else
print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield);
print_liste_field_titre($langs->trans("Bank"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); print_liste_field_titre($langs->trans("Bank"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield);
print_liste_field_titre($langs->trans("CheckTransmitter"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); print_liste_field_titre($langs->trans("CheckTransmitter"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield);
print "</tr>\n"; print "<td>&nbsp;</td></tr>\n";
$var=true; $var=true;
while ( $objp = $db->fetch_object($resql) ) while ( $objp = $db->fetch_object($resql) )
@ -272,20 +293,19 @@ else
print '<td align="right">'.price($objp->amount).'</td>'; print '<td align="right">'.price($objp->amount).'</td>';
print '<td>'.stripslashes($objp->banque).'</td>'; print '<td>'.stripslashes($objp->banque).'</td>';
print '<td>'.stripslashes($objp->emetteur).'</td>'; print '<td>'.stripslashes($objp->emetteur).'</td>';
if($remise->statut == 0)
{
print '<td align="right"><a href="fiche.php?id='.$remise->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a></td>';
}
else
{
print '<td>&nbsp;</td>';
}
print '</tr>'; print '</tr>';
$total += $objp->amount;
$i++; $i++;
$var=!$var; $var=!$var;
} }
print "<tr $bc[$var]>";
print '<td align="center">&nbsp;</td>';
print '<td align="right">'.$langs->trans("Total").'</td>';
print '<td align="right">'.price($total).'</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '</tr>';
print "</table>"; print "</table>";
} }
else else