diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 11964dde851..f8f9b5e9e74 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1562,7 +1562,6 @@ else */ $totalpaye = 0; - print $langs->trans('Payments').' :
'; $sql = 'SELECT '.$db->pdate('datep').' as dp, pf.amount,'; $sql.= ' c.libelle as paiement_type, p.num_paiement, p.rowid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement_facture as pf'; @@ -1576,7 +1575,7 @@ else $num = $db->num_rows($result); $i = 0; print ''; - print ''; + print ''; print ''; $var=True; @@ -2603,9 +2602,10 @@ else if (! $sortorder) $sortorder='DESC'; if (! $sortfield) $sortfield='f.datef'; - $sql = 'SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,'; + $sql = 'SELECT s.nom, s.idp,'; + $sql.= ' f.rowid as facid, f.facnumber, f.increment, f.total, f.total_ttc,'; $sql.= $db->pdate('f.datef').' as df, '.$db->pdate('f.date_lim_reglement').' as datelimite, '; - $sql.= ' f.paye as paye, f.rowid as facid, f.fk_statut'; + $sql.= ' f.paye as paye, f.fk_statut'; if (! $sall) $sql.= ' ,sum(pf.amount) as am'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ','.MAIN_DB_PREFIX.'facture as f'; @@ -2652,7 +2652,7 @@ else $sql .= ' AND (s.nom like \'%'.addslashes($sall).'%\' OR f.facnumber like \'%'.addslashes($sall).'%\' OR f.note like \'%'.addslashes($sall).'%\' OR fd.description like \'%'.addslashes($sall).'%\')'; } - $sql .= ' GROUP BY f.facnumber'; + $sql .= ' GROUP BY f.rowid'; $sql .= ' ORDER BY '; $listfield=split(',',$sortfield); diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 8396bd37a60..352f746a2ed 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -236,10 +236,14 @@ if ($socid > 0) print '
'.$langs->trans('Date').''.$langs->trans('Type').'
'.$langs->trans('Payments').''.$langs->trans('Type').''.$langs->trans('Amount').' 
'; - $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, f.total, f.total_ttc, ".$db->pdate("f.datef")." as df, f.paye as paye, f.fk_statut as statut, f.rowid as facid "; - $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; - $sql .= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id; - $sql .= " ORDER BY f.datef DESC"; + $sql = "SELECT s.nom, s.idp, f.rowid as facid, f.facnumber, f.amount, f.total, f.total_ttc,"; + $sql.= " ".$db->pdate("f.datef")." as df, f.paye as paye, f.fk_statut as statut"; + $sql.= ' ,sum(pf.amount) as am'; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture'; + $sql.= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id; + $sql.= ' GROUP BY f.rowid'; + $sql.= " ORDER BY f.datef DESC"; $resql=$db->query($sql); if ($resql) @@ -271,7 +275,7 @@ if ($socid > 0) } print "\n"; - print '\n"; + print '\n"; print "\n"; $i++; }
".price($objp->total_ttc)."'.($facturestatic->LibStatut($objp->paye,$objp->statut,5))."'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am))."