--- /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 ''; - 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 ''; - - print ''; - - print ''; - - print ''; - print ''; - $i++; - } - } else { - print ''; - } - print "
'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')
'; - print $invoicestatic->getNomUrl(1, 'withdraw'); - print ''; - print $thirdpartystatic->getNomUrl(1, 'supplier'); - print ''; - print price($obj->amount); - print ''; - print dol_print_date($db->jdate($obj->date_demande), 'day'); - print ''; - print $invoicestatic->getLibStatut(3, $alreadypayed); - print '
'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'

"; -} else { - dol_print_error($db); + $num = $db->num_rows($resql); + $i = 0; + + print '
'; + print ''; + print ''; + print ''; + 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 ''; + + print ''; + + print ''; + + print ''; + print ''; + $i++; + } + } + else + { + print ''; + } + print "
'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')
'; + print $invoicestatic->getNomUrl(1, 'withdraw'); + print ''; + print $thirdpartystatic->getNomUrl(1, 'customer'); + print ''; + print price($obj->amount); + print ''; + print dol_print_date($db->jdate($obj->date_demande), 'day'); + print ''; + print $invoicestatic->getLibStatut(3, $alreadypayed); + print '
'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'

"; +} +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 ''; - print ''; - print ''; - print ''; - print ''; - - if ($num > 0) { - while ($i < min($num, $limit)) - { - $obj = $db->fetch_object($result); - - print ''; - - print "\n"; - print '\n"; - print '\n"; - print '\n"; - - print "\n"; - $i++; - } - } else { - print ''; - } - - print "
'.$langs->trans("LatestBankTransferReceipts", $limit).''.$langs->trans("Date").''.$langs->trans("Amount").''.$langs->trans("Status").'
"; - $bprev->id = $obj->rowid; - $bprev->ref = $obj->ref; - $bprev->statut = $obj->statut; - print $bprev->getNomUrl(1); - print "'.dol_print_date($db->jdate($obj->datec), "dayhour")."'.price($obj->amount)."'.$bprev->getLibStatut(3)."
'.$langs->trans("None").'

"; - $db->free($result); -} else { - dol_print_error($db); + $num = $db->num_rows($result); + $i = 0; + + print"\n\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + if ($num > 0) { + while ($i < min($num, $limit)) + { + $obj = $db->fetch_object($result); + + print ''; + + print "\n"; + print '\n"; + print '\n"; + print '\n"; + + print "\n"; + $i++; + } + } else { + print ''; + } + + print "
'.$langs->trans("LatestBankTransferReceipts", $limit).''.$langs->trans("Date").''.$langs->trans("Amount").''.$langs->trans("Status").'
"; + $bprev->id = $obj->rowid; + $bprev->ref = $obj->ref; + $bprev->statut = $obj->statut; + print $bprev->getNomUrl(1); + print "'.dol_print_date($db->jdate($obj->datec), "dayhour")."'.price($obj->amount)."'.$bprev->getLibStatut(3)."
'.$langs->trans("None").'

"; + $db->free($result); +} +else +{ + dol_print_error($db); }