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

Fix: Rapport sur paiements fournisseurs passe par table llx_paiementfourn_facturefourn

Browse Source
This commit is contained in:
Laurent Destailleur 2005-12-17 00:26:35 +00:00
parent 95daa1ab13
commit 90fc000f06
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/resultat/clientfourn.php
View File

@ -127,7 +127,7 @@ if ($result) {
dolibarr_print_error($db);
}
// On ajoute les paiements anciennes version, non liés par paiement_facture
// On ajoute les paiements clients anciennes version, non liés par paiement_facture
if ($modecompta != 'CREANCES-DETTES') {
$sql = "SELECT 'Autres' as nom, '0' as idp, sum(p.amount) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
@ -191,12 +191,12 @@ if ($modecompta == 'CREANCES-DETTES') {
}
} else {
$sql = "SELECT s.nom, s.idp, sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p, ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
$sql .= " ON f.rowid = p.fk_facture_fourn";
$sql .= " ON f.rowid = pf.fk_facturefourn";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
$sql .= " ON f.fk_soc = s.idp";
$sql .= " WHERE 1=1";
$sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
if ($year) {
$sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
}