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

Fix sepa supplier count

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-18 03:44:26 +02:00
parent eef07afc90
commit fded55ddef
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/paymentbybanktransfer/index.php
View File

@ -78,13 +78,13 @@ print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</
print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToPayByBankTransfer").'</td>'; print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToPayByBankTransfer").'</td>';
print '<td class="right">'; print '<td class="right">';
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&type=bank-transfer">'; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&type=bank-transfer">';
print $bprev->nbOfInvoiceToPay('credit-transfer'); print $bprev->nbOfInvoiceToPay('bank-transfer');
print '</a>'; print '</a>';
print '</td></tr>'; print '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>'; print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
print '<td class="right">'; print '<td class="right">';
print price($bprev->SommeAPrelever('credit-transfer'), '', '', 1, -1, -1, 'auto'); print price($bprev->SommeAPrelever('bank-transfer'), '', '', 1, -1, -1, 'auto');
print '</td></tr></table></div><br>'; print '</td></tr></table></div><br>';

12
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -688,7 +688,7 @@ class BonPrelevement extends CommonObject
/** /**
* Returns amount of withdrawal * Returns amount of withdrawal
* *
* @param string $mode 'direct-debit' or 'credit-transfer' * @param string $mode 'direct-debit' or 'bank-transfer'
* @return double <O if KO, Total amount * @return double <O if KO, Total amount
*/ */
public function SommeAPrelever($mode = 'direct-debit') public function SommeAPrelever($mode = 'direct-debit')
@ -697,7 +697,7 @@ class BonPrelevement extends CommonObject
global $conf; global $conf;
$sql = "SELECT sum(pfd.amount) as nb"; $sql = "SELECT sum(pfd.amount) as nb";
if ($mode != 'credit-transfer') { if ($mode != 'bank-transfer') {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f,"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
} else { } else {
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,"; $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
@ -732,7 +732,7 @@ class BonPrelevement extends CommonObject
/** /**
* Get number of invoices waiting for payment * Get number of invoices waiting for payment
* *
* @param string $mode 'direct-debit' or 'credit-transfer' * @param string $mode 'direct-debit' or 'bank-transfer'
* @return int <O if KO, number of invoices if OK * @return int <O if KO, number of invoices if OK
*/ */
public function nbOfInvoiceToPay($mode = 'direct-debit') public function nbOfInvoiceToPay($mode = 'direct-debit')
@ -744,7 +744,7 @@ class BonPrelevement extends CommonObject
/** /**
* Get number of invoices to withdrawal * Get number of invoices to withdrawal
* *
* @param string $mode 'direct-debit' or 'credit-transfer' * @param string $mode 'direct-debit' or 'bank-transfer'
* @return int <O if KO, number of invoices if OK * @return int <O if KO, number of invoices if OK
*/ */
public function NbFactureAPrelever($mode = 'direct-debit') public function NbFactureAPrelever($mode = 'direct-debit')
@ -753,7 +753,7 @@ class BonPrelevement extends CommonObject
global $conf; global $conf;
$sql = "SELECT count(f.rowid) as nb"; $sql = "SELECT count(f.rowid) as nb";
if ($mode == 'credit-transfer') { if ($mode == 'bank-transfer') {
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
} else { } else {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@ -764,7 +764,7 @@ class BonPrelevement extends CommonObject
{ {
$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED; $sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
} }
if ($mode == 'credit-transfer') { if ($mode == 'bank-transfer') {
$sql .= " AND f.rowid = pfd.fk_facture_fourn"; $sql .= " AND f.rowid = pfd.fk_facture_fourn";
} else { } else {
$sql .= " AND f.rowid = pfd.fk_facture"; $sql .= " AND f.rowid = pfd.fk_facture";

2
htdocs/compta/prelevement/create.php
View File

@ -157,7 +157,7 @@ if ($type == 'bank-transfer') {
$title = $langs->trans("NbOfInvoiceToPayByBankTransfer"); $title = $langs->trans("NbOfInvoiceToPayByBankTransfer");
} }
print '<tr><td class="titlefield">'.$title.'</td>'; print '<tr><td class="titlefieldcreate">'.$title.'</td>';
print '<td>'; print '<td>';
print $nb; print $nb;
print '</td></tr>'; print '</td></tr>';

2
htdocs/langs/en_US/admin.lang
View File

@ -543,7 +543,7 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
Module55Name=Barcodes Module55Name=Barcodes
Module55Desc=Barcode management Module55Desc=Barcode management
Module56Name=Payment by credit transfer Module56Name=Payment by credit transfer
Module56Desc=Management of payment by credit transfer orders. It includes generation of SEPA file for European countries. Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
Module57Name=Bank Direct Debit payments Module57Name=Bank Direct Debit payments
Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries. Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
Module58Name=ClickToDial Module58Name=ClickToDial