diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 4b5351324a3..6102c9fd734 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -52,13 +52,13 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortfield) $sortfield="f.datef"; // Set here default search field
+if (! $sortfield) $sortfield="f.datef,f.rowid"; // Set here default search field
if (! $sortorder) $sortorder="DESC";
$arrayfields=array(
'f.datef'=>array('label'=>"Date", 'checked'=>1),
- //...
+ //...
);
/*
@@ -94,7 +94,7 @@ if ($id > 0)
dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 1);
dol_fiche_end();
-
+
if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
{
// Invoice list
@@ -110,9 +110,8 @@ if ($id > 0)
print '
'.$langs->trans("Balance").' | ';
print ''.$langs->trans("Author").' | ';
print '';
-
+
$TData = array();
- $TDataSort = array();
$sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.amount, f.datef as df,";
$sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
@@ -142,25 +141,25 @@ if ($id > 0)
continue;
}
$totalpaye = $fac->getSommePaiement();
-
+
$userstatic->id=$objf->userid;
$userstatic->login=$objf->login;
-
+
$values = array(
'fk_facture' => $objf->facid,
'date' => $fac->date,
+ 'datefieldforsort' => $fac->date.'-'.$fac->ref,
'link' => $fac->getNomUrl(1),
'status' => $fac->getLibStatut(2,$totalpaye),
'amount' => $fac->total_ttc,
'author' => $userstatic->getLoginUrl(1)
);
-
+
$parameters = array('socid' => $id, 'values' => &$values, 'fac' => $fac, 'userstatic' => $userstatic);
$reshook = $hookmanager->executeHooks('facdao', $parameters, $object); // Note that $parameters['values'] and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
+
$TData[] = $values;
- $TDataSort[] = $fac->date;
// Paiements
$sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,";
@@ -171,7 +170,7 @@ if ($id > 0)
$sql.= " WHERE pf.fk_paiement = p.rowid";
$sql.= " AND p.entity = ".$conf->entity;
$sql.= " AND pf.fk_facture = ".$fac->id;
- $sql.= " ORDER BY p.datep ASC";
+ $sql.= " ORDER BY p.datep ASC, p.rowid ASC";
$resqlp = $db->query($sql);
if ($resqlp)
@@ -182,28 +181,28 @@ if ($id > 0)
while ($j < $nump)
{
$objp = $db->fetch_object($resqlp);
-
+
$paymentstatic = new Paiement($db);
$paymentstatic->id = $objp->rowid;
-
+
$userstatic->id=$objp->userid;
$userstatic->login=$objp->login;
-
+
$values = array(
- 'fk_paiement' => $objp->rowid,
+ 'fk_paiement' => $objp->rowid,
'date' => $db->jdate($objp->dp),
+ 'datefieldforsort' => $db->jdate($objp->dp).'-'.$fac->ref,
'link' => $langs->trans("Payment") .' '. $paymentstatic->getNomUrl(1),
'status' => '',
'amount' => -$objp->amount,
'author' => $userstatic->getLoginUrl(1)
);
-
+
$parameters = array('socid' => $id, 'values' => &$values, 'fac' => $fac, 'userstatic' => $userstatic, 'paymentstatic' => $paymentstatic);
$reshook = $hookmanager->executeHooks('paydao', $parameters, $object); // Note that $parameters['values'] and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
+
$TData[] = $values;
- $TDataSort[] = $db->jdate($objp->dp);
$j++;
}
@@ -220,55 +219,58 @@ if ($id > 0)
{
dol_print_error($db);
}
-
+
if(empty($TData)) {
print '| '.$langs->trans("NoInvoice").' |
';
} else {
-
- // Sort array by date
- asort($TDataSort);
- array_multisort($TData,$TDataSort);
+
+ // Sort array by date ASC to calucalte balance
+ $TData = dol_sort_array($TData, 'datefieldforsort', 'ASC');
// Balance calculation
+ $balance = 0;
foreach($TData as &$data1) {
$balance += $data1['amount'];
$data1['balance'] += $balance;
}
-
- // Reverse array to have last elements on top
- $TData = dol_sort_array($TData, 'date', $sortorder);
-
-
+
+ // Resorte array to have elements on the required $sortorder
+ $TData = dol_sort_array($TData, 'datefieldforsort', $sortorder);
+
$totalDebit = 0;
$totalCredit = 0;
-
+
// Display array
foreach($TData as $data) {
-
+
$html_class = '';
if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
-
+
print '';
-
- print "| ".dol_print_date($data['date'],'day')." | \n";
+
+ print "";
+ if (!empty($data['fk_facture'])) print dol_print_date($data['date'],'day');
+ elseif (!empty($data['fk_paiement'])) print dol_print_date($data['date'],'dayhour');
+ print " | \n";
print ''.$data['link']." | \n";
-
+
print ''.$data['status'].' | ';
print ''.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." | \n";
$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
print ''.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." | \n";
$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
+ // Balance
print ''.price($data['balance'])." | \n";
-
+
// Author
print '';
print $data['author'];
print ' | ';
-
+
print "
\n";
}
-
+
print '';
print '| | ';
print ''.price($totalDebit).' | ';
@@ -277,7 +279,7 @@ if ($id > 0)
print ' | ';
print "
\n";
}
-
+
print "";
}
}