Merge pull request #15106 from frederic34/rejet

add type
This commit is contained in:
Laurent Destailleur 2020-10-22 21:36:36 +02:00 committed by GitHub
commit a5e2ab2822
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View File

@ -151,7 +151,7 @@ if ($prev_id > 0 || $ref)
} }
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user, $type);
/* /*
* List errors * List errors

View File

@ -158,7 +158,7 @@ if ($id)
if ($lipre->statut == 3) if ($lipre->statut == 3)
{ {
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user, $type);
$resf = $rej->fetch($lipre->id); $resf = $rej->fetch($lipre->id);
if ($resf == 0) if ($resf == 0)
{ {

View File

@ -65,7 +65,7 @@ llxHeader('', $title);
if ($sortorder == "") $sortorder = "DESC"; if ($sortorder == "") $sortorder = "DESC";
if ($sortfield == "") $sortfield = "p.datec"; if ($sortfield == "") $sortfield = "p.datec";
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user, $type);
$line = new LignePrelevement($db); $line = new LignePrelevement($db);
$hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist')); $hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));

View File

@ -214,7 +214,7 @@ if ($resql)
print '<td class="right">%</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>'; print '<td class="right">%</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
$Rejet = new RejetPrelevement($db, $user); $Rejet = new RejetPrelevement($db, $user, $type);
while ($i < $num) while ($i < $num)
{ {