diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 9e21c584678..266604a4c43 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -307,7 +307,8 @@ if ($massaction == 'makepayment') {
header('Location: '.$loc);
exit;
-} elseif ($massaction == 'withdrawrequest')
+}
+elseif ($massaction == 'withdrawrequest')
{
$langs->load("withdrawals");
@@ -667,7 +668,7 @@ if ($resql)
'presend'=>$langs->trans("SendByMail"),
//'makepayment'=>$langs->trans("InvoicePaymentsLimits"), TODO Blank page when using this
);
- if ($conf->prelevement->enabled) {
+ if ($conf->prelevement->enabled && !empty($user->rights->prelevement->bons->creer)) {
$langs->load("withdrawals");
$arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
}
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index f6a00f606ba..792ff73bcd3 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -632,8 +632,10 @@ if ($object->id > 0)
print "\n
\n";
$buttonlabel = $langs->trans("MakeWithdrawRequest");
+ $user_perms=$user->rights->prelevement->bons->creer;
if ($type == 'bank-transfer') {
$buttonlabel = $langs->trans("MakeBankTransferOrder");
+ $user_perms=$user->rights->paymentbybanktransfer->create;
}
// Add a transfer request
@@ -641,7 +643,7 @@ if ($object->id > 0)
{
if ($resteapayer > 0)
{
- if ($user->rights->prelevement->bons->creer)
+ if ($user_perms)
{
$remaintopaylesspendingdebit = $resteapayer - $pending;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 39b91f42b09..a3d0d343056 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -272,6 +272,97 @@ if (empty($reshook))
$permissiontodelete = $user->rights->fournisseur->facture->supprimer;
$uploaddir = $conf->fournisseur->facture->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+ if ($massaction == 'banktransfertrequest')
+ {
+ $langs->load("withdrawals");
+
+ if (!$user->rights->paymentbybanktransfer->create)
+ {
+ $error++;
+ setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+ } else {
+ //Checking error
+ $error = 0;
+
+ $arrayofselected = is_array($toselect) ? $toselect : array();
+ $listofbills = array();
+ foreach ($arrayofselected as $toselectid)
+ {
+ $objecttmp = new FactureFournisseur($db);
+ $result = $objecttmp->fetch($toselectid);
+ if ($result > 0)
+ {
+ $totalpaye = $objecttmp->getSommePaiement();
+ $totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
+ $totaldeposits = $objecttmp->getSumDepositsUsed();
+ $objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ if ($objecttmp->paye || $objecttmp->resteapayer == 0) {
+ $error++;
+ setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
+ } elseif ($objecttmp->resteapayer < 0) {
+ $error++;
+ setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
+ }
+ if (!($objecttmp->statut > FactureFournisseur::STATUS_DRAFT)) {
+ $error++;
+ setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+ }
+
+ $rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+ $rsql .= " , pfd.date_traite as date_traite";
+ $rsql .= " , pfd.amount";
+ $rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
+ $rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $rsql .= " , ".MAIN_DB_PREFIX."user as u";
+ $rsql .= " WHERE fk_facture_fourn = ".$objecttmp->id;
+ $rsql .= " AND pfd.fk_user_demande = u.rowid";
+ $rsql .= " AND pfd.traite = 0";
+ $rsql .= " ORDER BY pfd.date_demande DESC";
+
+ $result_sql = $db->query($rsql);
+ if ($result_sql)
+ {
+ $numprlv = $db->num_rows($result_sql);
+ }
+
+ if ($numprlv > 0) {
+ $error++;
+ setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
+ } elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
+ $error++;
+ setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
+ } else {
+ $listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
+ }
+ }
+ }
+
+ //Massive withdraw request for request with no errors
+ if (!empty($listofbills))
+ {
+ $nbwithdrawrequestok = 0;
+ foreach ($listofbills as $aBill)
+ {
+ $db->begin();
+ $result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
+ if ($result > 0)
+ {
+ $db->commit();
+ $nbwithdrawrequestok++;
+ } else {
+ $db->rollback();
+ setEventMessages($aBill->error, $aBill->errors, 'errors');
+ }
+ }
+ if ($nbwithdrawrequestok > 0)
+ {
+ setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
+ }
+ }
+ }
+ }
+
}
@@ -517,6 +608,10 @@ if ($resql)
//'presend'=>$langs->trans("SendByMail"),
);
//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+ if (!empty($conf->paymentbybanktransfer->enabled) && !empty($user->rights->paymentbybanktransfer->create)) {
+ $langs->load('withdrawals');
+ $arrayofmassactions['banktransfertrequest'] = $langs->trans("MakeBankTransferOrder");
+ }
if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete'] = ''.$langs->trans("Delete");
if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);