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

NEW Can rename (so reorder) bank receipts

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-13 23:38:57 +02:00
parent d06f260b94
commit b90770c30c
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/compta/bank/releve.php
View File

@ -52,6 +52,9 @@ $ref=GETPOST('ref','alpha');
$dvid=GETPOST('dvid','alpha');
$numref=GETPOST('num','alpha');
$ve=GETPOST("ve",'alpha');
$brref=GETPOST('brref','alpha');
$oldbankreceipt=GETPOST('oldbankreceipt','alpha');
$newbankreceipt=GETPOST('newbankreceipt','alpha');
// Security check
$fieldid = (! empty($ref)?$ref:$id);
@ -149,9 +152,6 @@ else {
}
$sql = "SELECT b.rowid, b.dateo as do, b.datev as dv,";
$sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
$sql.= " b.fk_bordereau,";
@ -174,6 +174,16 @@ $sqlrequestforbankline = $sql;
* Actions
*/
if ($action == 'confirm_editbankreceipt' && ! empty($oldbankreceipt) && ! empty($newbankreceipt))
{
// TODO Add a test to check newbankreceipt does not exists yet
$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX.'bank SET num_releve = "'.$db->escape($newbankreceipt).'" WHERE num_releve = "'.$db->escape($oldbankreceipt).'"';
$result = $db->query($sqlupdate);
if ($result < 0) dol_print_error($db);
$action='view';
}
// ZIP creation
if ($action=="dl" && $numref > 0)
{
@ -404,16 +414,22 @@ if (empty($numref))
}
print '</div>';
print '<br><br>';
print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$object->id, $sortfield, $sortorder,'',$numrows);
print '<form name="aaa" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="confirm_editbankreceipt">';
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
print '<input type="hidden" name="account" value="'.$object->id.'">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("AccountStatement").'</td>';
print '<td align="right">'.$langs->trans("InitialBankBalance").'</td>';
print '<td align="right">'.$langs->trans("EndBankBalance").'</td>';
print '<td></td>';
print '</tr>';
$balancestart=array();
@ -429,7 +445,20 @@ if (empty($numref))
}
else
{
print '<tr class="oddeven"><td><a href="releve.php?num='.$objp->numr.'&amp;account='.$object->id.'">'.$objp->numr.'</a></td>';
print '<tr class="oddeven">';
print '<td>';
if ($action != 'editbankreceipt' || $objp->numr != $brref)
{
print '<a href="releve.php?num='.$objp->numr.'&account='.$object->id.'">'.$objp->numr.'</a>';
}
else
{
print '<input type="hidden" name="oldbankreceipt" value="'.$objp->numr.'">';
print '<input type="text" name="newbankreceipt" value="'.$objp->numr.'">';
print '<input type="submit" class="button" name="actionnewbankreceipt" value="'.$langs->trans("Rename").'">';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
}
print '</td>';
// Calculate start amount
$sql = "SELECT sum(b.amount) as amount";
@ -459,11 +488,18 @@ if (empty($numref))
}
print '<td align="right">'.price(($balancestart[$objp->numr]+$content[$objp->numr]),'',$langs,1,-1,-1,$conf->currency).'</td>';
print '<td align="center">';
if ($user->rights->banque->consolidate && $action != 'editbankreceipt') {
print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.'&action=editbankreceipt&brref='.$objp->numr.'">'.img_edit().'</a>';
}
print '</td>';
print '</tr>'."\n";
}
$i++;
}
print "</table>\n";
print '</form>';
print "\n</div>\n";
}