Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2019-10-08 16:35:41 +02:00
commit cb8b48e8f9

View File

@ -268,6 +268,7 @@ if (empty($numref))
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 '<input type="hidden" name="page" value="'.$page.'">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@ -335,7 +336,7 @@ if (empty($numref))
print '<td class="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 '<a href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.($page > 0 ? '&page='.$page : '').'&action=editbankreceipt&brref='.$objp->numr.'">'.img_edit().'</a>';
}
print '</td>';