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

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-11 22:38:53 +01:00
parent b1fedab447
commit 9a68d1df22
7 changed files with 1931 additions and 1756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3661
dev/initdemo/mysqldump_dolibarr_16.0.0.sql → dev/initdemo/mysqldump_dolibarr_17.0.0.sql
View File

File diff suppressed because one or more lines are too long

9
htdocs/compta/paiement/cheque/index.php
View File

@ -53,7 +53,7 @@ print load_fiche_titre($langs->trans("ChequesArea"), '', $checkdepositstatic->pi
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
$sql = "SELECT count(b.rowid)"; $sql = "SELECT count(b.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
$sql .= " WHERE ba.rowid = b.fk_account"; $sql .= " WHERE ba.rowid = b.fk_account";
@ -70,13 +70,14 @@ print '<th colspan="2">'.$langs->trans("BankChecks")."</th>\n";
print "</tr>\n"; print "</tr>\n";
if ($resql) { if ($resql) {
if ($row = $db->fetch_row($resql)) { $num = '';
$num = $row[0]; if ($obj = $db->fetch_object($resql)) {
$num = $obj->nb;
} }
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.$langs->trans("BankChecksToReceipt").'</td>'; print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
print '<td class="right">'; print '<td class="right">';
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>'; print '<a class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
print '</td></tr>'; print '</td></tr>';
print "</table>\n"; print "</table>\n";
} else { } else {

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

@ -86,7 +86,7 @@ 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 class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&type=bank-transfer">';
print $bprev->nbOfInvoiceToPay('bank-transfer'); print $bprev->nbOfInvoiceToPay('bank-transfer');
print '</a>'; print '</a>';
print '</td></tr>'; print '</td></tr>';
@ -183,7 +183,8 @@ if ($resql) {
$i++; $i++;
} }
} else { } else {
print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</span></td></tr>'; $titlefortab = $langs->transnoentitiesnoconv("BankTransfer");
print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $titlefortab, $titlefortab).'</span></td></tr>';
} }
print "</table></div><br>"; print "</table></div><br>";
} else { } else {

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

@ -86,7 +86,7 @@ print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</
print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>'; print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
print '<td class="right">'; print '<td class="right">';
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">'; print '<a class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
print $bprev->nbOfInvoiceToPay('direct-debit'); print $bprev->nbOfInvoiceToPay('direct-debit');
print '</a>'; print '</a>';
print '</td></tr>'; print '</td></tr>';
@ -184,7 +184,7 @@ if ($resql) {
} }
} else { } else {
$titlefortab = $langs->transnoentitiesnoconv("StandingOrders"); $titlefortab = $langs->transnoentitiesnoconv("StandingOrders");
print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $titlefortab, $titlefortab).'</td></tr>'; print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $titlefortab, $titlefortab).'</span></td></tr>';
} }
print "</table></div><br>"; print "</table></div><br>";
} else { } else {

2
htdocs/install/mysql/tables/llx_prelevement.key.sql
View File

@ -21,5 +21,5 @@
ALTER TABLE llx_prelevement ADD INDEX idx_prelevement_fk_prelevement_lignes (fk_prelevement_lignes); ALTER TABLE llx_prelevement ADD INDEX idx_prelevement_fk_prelevement_lignes (fk_prelevement_lignes);
ALTER TABLE llx_prelevement ADD CONSTRAINT fk_prelevement_facture_fk_prelevement_lignes FOREIGN KEY (fk_prelevement_lignes) REFERENCES llx_prelevement_lignes (rowid); ALTER TABLE llx_prelevement ADD CONSTRAINT fk_prelevement_fk_prelevement_lignes FOREIGN KEY (fk_prelevement_lignes) REFERENCES llx_prelevement_lignes (rowid);

4
htdocs/install/mysql/tables/llx_prelevement_demande.key.sql
View File

@ -17,6 +17,6 @@
-- =================================================================== -- ===================================================================
ALTER TABLE llx_prelevement_demande ADD INDEX idx_prelevement_facture_demande_fk_facture (fk_facture); ALTER TABLE llx_prelevement_demande ADD INDEX idx_prelevement_demande_fk_facture (fk_facture);
ALTER TABLE llx_prelevement_demande ADD INDEX idx_prelevement_facture_demande_fk_facture_fourn (fk_facture_fourn); ALTER TABLE llx_prelevement_demande ADD INDEX idx_prelevement_demande_fk_facture_fourn (fk_facture_fourn);

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

@ -33,7 +33,7 @@ InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
AmountToWithdraw=Amount to withdraw AmountToWithdraw=Amount to withdraw
AmountToTransfer=Amount to transfer AmountToTransfer=Amount to transfer
NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request. NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request. NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
ResponsibleUser=User Responsible ResponsibleUser=User Responsible
WithdrawalsSetup=Direct debit payment setup WithdrawalsSetup=Direct debit payment setup
CreditTransferSetup=Credit transfer setup CreditTransferSetup=Credit transfer setup