--- /tmp/dsg/dolibarr/htdocs/compta/paymentbybanktransfer/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/compta/paymentbybanktransfer/client_index.php
@@ -68,7 +68,7 @@
$thirdpartystatic = new Societe($db);
-$invoicestatic = new FactureFournisseur($db);
+$invoicestatic = new Facture($db);
$bprev = new BonPrelevement($db);
print '
';
@@ -94,7 +94,7 @@
*/
$sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
$sql .= " pfd.date_demande, pfd.amount,";
-$sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra";
+$sql .= " s.nom as name, s.email, s.rowid as socid";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
$sql .= " ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -115,59 +115,62 @@
$resql = $db->query($sql);
if ($resql)
{
- $num = $db->num_rows($resql);
- $i = 0;
-
- print '
';
- print '
';
- print '';
- print ''.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.') |
';
- if ($num)
- {
- while ($i < $num && $i < 20)
- {
- $obj = $db->fetch_object($resql);
-
- $invoicestatic->id = $obj->rowid;
- $invoicestatic->ref = $obj->ref;
- $invoicestatic->statut = $obj->fk_statut;
- $invoicestatic->paye = $obj->paye;
- $invoicestatic->type = $obj->type;
- $alreadypayed = $invoicestatic->getSommePaiement();
-
- $thirdpartystatic->id = $obj->socid;
- $thirdpartystatic->name = $obj->name;
- $thirdpartystatic->email = $obj->email;
- $thirdpartystatic->tva_intra = $obj->tva_intra;
-
- print '';
- print $invoicestatic->getNomUrl(1, 'withdraw');
- print ' | ';
-
- print '';
- print $thirdpartystatic->getNomUrl(1, 'supplier');
- print ' | ';
-
- print '';
- print price($obj->amount);
- print ' | ';
-
- print '';
- print dol_print_date($db->jdate($obj->date_demande), 'day');
- print ' | ';
-
- print '';
- print $invoicestatic->getLibStatut(3, $alreadypayed);
- print ' | ';
- print '
';
- $i++;
- }
- } else {
- print ''.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).' |
';
- }
- print "
";
-} else {
- dol_print_error($db);
+ $num = $db->num_rows($resql);
+ $i = 0;
+
+ print '
';
+ print '
';
+ print '';
+ print ''.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.') |
';
+ if ($num)
+ {
+ while ($i < $num && $i < 20)
+ {
+ $obj = $db->fetch_object($resql);
+
+ $invoicestatic->id = $obj->rowid;
+ $invoicestatic->ref = $obj->ref;
+ $invoicestatic->statut = $obj->fk_statut;
+ $invoicestatic->paye = $obj->paye;
+ $invoicestatic->type = $obj->type;
+ $alreadypayed = $invoicestatic->getSommePaiement();
+
+ $thirdpartystatic->id = $obj->socid;
+ $thirdpartystatic->name = $obj->name;
+ $thirdpartystatic->email = $obj->email;
+
+ print '';
+ print $invoicestatic->getNomUrl(1, 'withdraw');
+ print ' | ';
+
+ print '';
+ print $thirdpartystatic->getNomUrl(1, 'customer');
+ print ' | ';
+
+ print '';
+ print price($obj->amount);
+ print ' | ';
+
+ print '';
+ print dol_print_date($db->jdate($obj->date_demande), 'day');
+ print ' | ';
+
+ print '';
+ print $invoicestatic->getLibStatut(3, $alreadypayed);
+ print ' | ';
+ print '
';
+ $i++;
+ }
+ }
+ else
+ {
+ print ''.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).' |
';
+ }
+ print "
";
+}
+else
+{
+ dol_print_error($db);
}
@@ -188,47 +191,49 @@
$result = $db->query($sql);
if ($result)
{
- $num = $db->num_rows($result);
- $i = 0;
-
- print"\n\n";
- print '
';
- print '
';
- print '';
- print ''.$langs->trans("LatestBankTransferReceipts", $limit).' | ';
- print ''.$langs->trans("Date").' | ';
- print ''.$langs->trans("Amount").' | ';
- print ''.$langs->trans("Status").' | ';
- print '
';
-
- if ($num > 0) {
- while ($i < min($num, $limit))
- {
- $obj = $db->fetch_object($result);
-
- print '';
-
- print "";
- $bprev->id = $obj->rowid;
- $bprev->ref = $obj->ref;
- $bprev->statut = $obj->statut;
- print $bprev->getNomUrl(1);
- print " | \n";
- print ''.dol_print_date($db->jdate($obj->datec), "dayhour")." | \n";
- print ''.price($obj->amount)." | \n";
- print ''.$bprev->getLibStatut(3)." | \n";
-
- print "
\n";
- $i++;
- }
- } else {
- print ''.$langs->trans("None").' |
';
- }
-
- print "
";
- $db->free($result);
-} else {
- dol_print_error($db);
+ $num = $db->num_rows($result);
+ $i = 0;
+
+ print"\n\n";
+ print '
';
+ print '
';
+ print '';
+ print ''.$langs->trans("LatestBankTransferReceipts", $limit).' | ';
+ print ''.$langs->trans("Date").' | ';
+ print ''.$langs->trans("Amount").' | ';
+ print ''.$langs->trans("Status").' | ';
+ print '
';
+
+ if ($num > 0) {
+ while ($i < min($num, $limit))
+ {
+ $obj = $db->fetch_object($result);
+
+ print '';
+
+ print "";
+ $bprev->id = $obj->rowid;
+ $bprev->ref = $obj->ref;
+ $bprev->statut = $obj->statut;
+ print $bprev->getNomUrl(1);
+ print " | \n";
+ print ''.dol_print_date($db->jdate($obj->datec), "dayhour")." | \n";
+ print ''.price($obj->amount)." | \n";
+ print ''.$bprev->getLibStatut(3)." | \n";
+
+ print "
\n";
+ $i++;
+ }
+ } else {
+ print ''.$langs->trans("None").' |
';
+ }
+
+ print "
";
+ $db->free($result);
+}
+else
+{
+ dol_print_error($db);
}