';
print '';
- print '| ';
+ print ' | ';
print '';
print ' |
';
@@ -720,22 +720,23 @@ if ($object->id > 0) {
while ($i < $num && $i < $MAXLIST) {
$obj = $db->fetch_object($resql);
- print '';
- print '| ';
$orderstatic->id = $obj->rowid;
$orderstatic->ref = $obj->ref;
$orderstatic->total_ht = $obj->total_ht;
$orderstatic->total_tva = $obj->total_tva;
$orderstatic->total_ttc = $obj->total_ttc;
+ $orderstatic->date = $db->jdate($obj->date);
+
+ print ' |
';
+ print '| ';
print $orderstatic->getNomUrl(1);
print ' | ';
print '';
- if ($obj->dc) {
- print dol_print_date($db->jdate($obj->dc), 'day');
- } else {
- print "-";
+ if ($obj->date) {
+ print dol_print_date($orderstatic->date, 'day');
}
print ' | ';
+ print ''.price($orderstatic->total_ttc).' | ';
print ''.$orderstatic->LibStatut($obj->fk_statut, 5).' | ';
print '
';
$i++;
@@ -759,7 +760,7 @@ if ($object->id > 0) {
if ($user->rights->fournisseur->facture->lire) {
// TODO move to DAO class
- $sql = 'SELECT f.rowid, f.libelle as label, f.ref, f.ref_supplier, f.fk_statut, f.datef as df, f.total_ht, f.total_tva, f.total_ttc as amount,f.paye,';
+ $sql = 'SELECT f.rowid, f.libelle as label, f.ref, f.ref_supplier, f.fk_statut, f.datef as df, f.total_ht, f.total_tva, f.total_ttc, f.paye,';
$sql .= ' SUM(pf.amount) as am';
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn';
@@ -777,7 +778,8 @@ if ($object->id > 0) {
print '';
print '';
- print '| '.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).' | '.$langs->trans('AllBills').''.$num.' | ';
+ print '';
print ' ';
@@ -786,8 +788,6 @@ if ($object->id > 0) {
while ($i < min($num, $MAXLIST)) {
$obj = $db->fetch_object($resql);
- print '';
- print '| ';
$facturestatic->id = $obj->rowid;
$facturestatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
$facturestatic->ref_supplier = $obj->ref_supplier;
@@ -796,12 +796,16 @@ if ($object->id > 0) {
$facturestatic->total_ht = $obj->total_ht;
$facturestatic->total_tva = $obj->total_tva;
$facturestatic->total_ttc = $obj->total_ttc;
+ $facturestatic->date = $db->jdate($obj->df);
+
+ print ' | ';
+ print '| ';
print ''.$facturestatic->getNomUrl(1).'';
print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
print ' | ';
- print ''.dol_print_date($db->jdate($obj->df), 'day').' | ';
- print ''.price($obj->amount).' | ';
+ print ''.dol_print_date($facturestatic->date, 'day').' | ';
+ print ''.price($facturestatic->total_ttc).' | ';
print '';
print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $obj->am);
print ' | ';
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 9a67c3922f0..a20e586e2ee 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -257,6 +257,7 @@ if ($resql) {
$trackid = 'prod'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+ print '';
print ' ';
// Fields title search
@@ -357,7 +358,7 @@ if ($resql) {
}
$db->free($resql);
- print " ";
+ print " ";
print '';
} else {
|