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

FIX #8192

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-15 14:47:08 +01:00
parent 7722f004c8
commit 13dd440fd4
1 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
htdocs/compta/recap-compta.php
View File

@ -52,13 +52,13 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $limit * $page; $offset = $limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $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"; if (! $sortorder) $sortorder="DESC";
$arrayfields=array( $arrayfields=array(
'f.datef'=>array('label'=>"Date", 'checked'=>1), '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_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 1); dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 1);
dol_fiche_end(); dol_fiche_end();
if (! empty($conf->facture->enabled) && $user->rights->facture->lire) if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
{ {
// Invoice list // Invoice list
@ -110,9 +110,8 @@ if ($id > 0)
print '<td align="right">'.$langs->trans("Balance").'</td>'; print '<td align="right">'.$langs->trans("Balance").'</td>';
print '<td align="right">'.$langs->trans("Author").'</td>'; print '<td align="right">'.$langs->trans("Author").'</td>';
print '</tr>'; print '</tr>';
$TData = array(); $TData = array();
$TDataSort = array();
$sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.amount, f.datef as df,"; $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,"; $sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
@ -142,25 +141,25 @@ if ($id > 0)
continue; continue;
} }
$totalpaye = $fac->getSommePaiement(); $totalpaye = $fac->getSommePaiement();
$userstatic->id=$objf->userid; $userstatic->id=$objf->userid;
$userstatic->login=$objf->login; $userstatic->login=$objf->login;
$values = array( $values = array(
'fk_facture' => $objf->facid, 'fk_facture' => $objf->facid,
'date' => $fac->date, 'date' => $fac->date,
'datefieldforsort' => $fac->date.'-'.$fac->ref,
'link' => $fac->getNomUrl(1), 'link' => $fac->getNomUrl(1),
'status' => $fac->getLibStatut(2,$totalpaye), 'status' => $fac->getLibStatut(2,$totalpaye),
'amount' => $fac->total_ttc, 'amount' => $fac->total_ttc,
'author' => $userstatic->getLoginUrl(1) 'author' => $userstatic->getLoginUrl(1)
); );
$parameters = array('socid' => $id, 'values' => &$values, 'fac' => $fac, 'userstatic' => $userstatic); $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 $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'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
$TData[] = $values; $TData[] = $values;
$TDataSort[] = $fac->date;
// Paiements // Paiements
$sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,"; $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.= " WHERE pf.fk_paiement = p.rowid";
$sql.= " AND p.entity = ".$conf->entity; $sql.= " AND p.entity = ".$conf->entity;
$sql.= " AND pf.fk_facture = ".$fac->id; $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); $resqlp = $db->query($sql);
if ($resqlp) if ($resqlp)
@ -182,28 +181,28 @@ if ($id > 0)
while ($j < $nump) while ($j < $nump)
{ {
$objp = $db->fetch_object($resqlp); $objp = $db->fetch_object($resqlp);
$paymentstatic = new Paiement($db); $paymentstatic = new Paiement($db);
$paymentstatic->id = $objp->rowid; $paymentstatic->id = $objp->rowid;
$userstatic->id=$objp->userid; $userstatic->id=$objp->userid;
$userstatic->login=$objp->login; $userstatic->login=$objp->login;
$values = array( $values = array(
'fk_paiement' => $objp->rowid, 'fk_paiement' => $objp->rowid,
'date' => $db->jdate($objp->dp), 'date' => $db->jdate($objp->dp),
'datefieldforsort' => $db->jdate($objp->dp).'-'.$fac->ref,
'link' => $langs->trans("Payment") .' '. $paymentstatic->getNomUrl(1), 'link' => $langs->trans("Payment") .' '. $paymentstatic->getNomUrl(1),
'status' => '', 'status' => '',
'amount' => -$objp->amount, 'amount' => -$objp->amount,
'author' => $userstatic->getLoginUrl(1) 'author' => $userstatic->getLoginUrl(1)
); );
$parameters = array('socid' => $id, 'values' => &$values, 'fac' => $fac, 'userstatic' => $userstatic, 'paymentstatic' => $paymentstatic); $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 $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'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
$TData[] = $values; $TData[] = $values;
$TDataSort[] = $db->jdate($objp->dp);
$j++; $j++;
} }
@ -220,55 +219,58 @@ if ($id > 0)
{ {
dol_print_error($db); dol_print_error($db);
} }
if(empty($TData)) { if(empty($TData)) {
print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>'; print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
} else { } else {
// Sort array by date // Sort array by date ASC to calucalte balance
asort($TDataSort); $TData = dol_sort_array($TData, 'datefieldforsort', 'ASC');
array_multisort($TData,$TDataSort);
// Balance calculation // Balance calculation
$balance = 0;
foreach($TData as &$data1) { foreach($TData as &$data1) {
$balance += $data1['amount']; $balance += $data1['amount'];
$data1['balance'] += $balance; $data1['balance'] += $balance;
} }
// Reverse array to have last elements on top // Resorte array to have elements on the required $sortorder
$TData = dol_sort_array($TData, 'date', $sortorder); $TData = dol_sort_array($TData, 'datefieldforsort', $sortorder);
$totalDebit = 0; $totalDebit = 0;
$totalCredit = 0; $totalCredit = 0;
// Display array // Display array
foreach($TData as $data) { foreach($TData as $data) {
$html_class = ''; $html_class = '';
if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture']; if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement']; elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
print '<tr class="oddeven '.$html_class.'">'; print '<tr class="oddeven '.$html_class.'">';
print "<td align=\"center\">".dol_print_date($data['date'],'day')."</td>\n"; print "<td align=\"center\">";
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 "</td>\n";
print '<td>'.$data['link']."</td>\n"; print '<td>'.$data['link']."</td>\n";
print '<td aling="left">'.$data['status'].'</td>'; print '<td aling="left">'.$data['status'].'</td>';
print '<td align="right">'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')."</td>\n"; print '<td align="right">'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')."</td>\n";
$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0; $totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
print '<td align="right">'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))."</td>\n"; print '<td align="right">'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))."</td>\n";
$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']); $totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
// Balance
print '<td align="right">'.price($data['balance'])."</td>\n"; print '<td align="right">'.price($data['balance'])."</td>\n";
// Author // Author
print '<td class="nowrap" align="right">'; print '<td class="nowrap" align="right">';
print $data['author']; print $data['author'];
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="3">&nbsp;</td>'; print '<td colspan="3">&nbsp;</td>';
print '<td align="right">'.price($totalDebit).'</td>'; print '<td align="right">'.price($totalDebit).'</td>';
@ -277,7 +279,7 @@ if ($id > 0)
print '<td></td>'; print '<td></td>';
print "</tr>\n"; print "</tr>\n";
} }
print "</table>"; print "</table>";
} }
} }