diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index e3c2f6193de..0dbf657d23c 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -39,13 +39,14 @@ $modecompta = $conf->compta->mode; if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; -print_fiche_titre("Détail recettes-dépenses par client/fournisseur",($year?"  ".img_previous()." Année $year ".img_next()."":"")); +print_fiche_titre("Résultat exercice, par client/fournisseur",($year?"  ".img_previous()." Année $year ".img_next()."":"")); print '
'; +print "Cet état permet de faire un bilan des recettes et dépenses:
"; if ($modecompta=="CREANCES-DETTES") { print $langs->trans("RulesResultDue"); - print '(Voir le rapport recettes-dépenses pour n\'inclure que les factures effectivement payées).
'; + print '(Voir le rapport en recettes-dépenses pour n\'inclure que les factures effectivement payées).
'; print '
'; } else { @@ -58,7 +59,7 @@ else { print ''; print ''; print ''; -print ""; +if ($modecompta == 'CREANCES-DETTES') print ""; print ""; print "\n"; @@ -66,24 +67,27 @@ print "\n"; /* * Factures clients */ -if ($conf->compta->mode == 'CREANCES-DETTES') { +if ($modecompta == 'CREANCES-DETTES') { $sql = "SELECT s.nom, s.idp, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc"; - $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1"; - if ($_GET["year"]) { - $sql .= " AND f.datef between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'"; + if ($year) { + $sql .= " AND f.datef between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'"; } } else { - $sql = "SELECT 'Fournisseurs' as nom, '0' as idp, sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; - $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p "; - $sql .= "left join ".MAIN_DB_PREFIX."facture as f "; - $sql .= "on f.rowid = p.fk_facture"; - if ($_GET["year"]) { - $sql .= " AND p.datep between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'"; + /* + * Liste des paiements par société (les anciens paiements ne sont pas inclus + * car n'était pas liés sur les vieilles versions) + */ + $sql = "SELECT s.nom as nom, s.idp as idp, sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p"; + $sql .= " WHERE f.fk_soc = s.idp AND f.rowid = pf.fk_facture AND pf.fk_paiement = p.rowid"; + if ($year) { + $sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'"; } } -$sql .= " GROUP BY nom ASC"; - +$sql .= " GROUP BY nom"; +$sql .= " ORDER BY nom"; print ''; @@ -98,9 +102,9 @@ if ($result) { $var=!$var; print ""; - print "\n"; + print "\n"; - print "\n"; + if ($modecompta == 'CREANCES-DETTES') print "\n"; print "\n"; $total_ht = $total_ht + $objp->amount_ht; @@ -112,31 +116,73 @@ if ($result) { } else { dolibarr_print_error($db); } +// Ajoute paiements 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, date_format(p.datep,'%Y-%m') as dm"; + $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement"; + $sql .= " WHERE pf.rowid IS NULL"; + if ($year) { + $sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'"; + } + $sql .= " GROUP BY nom"; + $sql .= " ORDER BY nom"; + + $result = $db->query($sql); + if ($result) { + $num = $db->num_rows($result); + $i = 0; + $var=true; + while ($i < $num) + { + $objp = $db->fetch_object($result); + $var=!$var; + + print ""; + print "\n"; + print "\n"; + + $total_ht = $total_ht + $objp->amount_ht; + $total_ttc = $total_ttc + $objp->amount_ttc; + print "\n"; + $i++; + } + $db->free($result); + } else { + dolibarr_print_error($db); + } +} print ''; -print ''; -print ''; +if ($modecompta == 'CREANCES-DETTES') print ''; +print ''; print ''; /* * Frais, factures fournisseurs. */ -if ($conf->compta->mode == 'CREANCES-DETTES') { +if ($modecompta == 'CREANCES-DETTES') { $sql = "SELECT s.nom, s.idp, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1"; - if ($_GET["year"]) { - $sql .= " AND f.datef between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'"; + if ($year) { + $sql .= " AND f.datef between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'"; } } else { - $sql = "SELECT 'Fournisseurs' as nom, '0' as idp, sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; - $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p "; - $sql .= "left join ".MAIN_DB_PREFIX."facture_fourn as f "; - $sql .= "on f.rowid = p.fk_facture_fourn"; - if ($_GET["year"]) { - $sql .= " AND p.datep between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'"; + $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 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f"; + $sql .= " ON f.rowid = p.fk_facture_fourn"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s"; + $sql .= " ON f.fk_soc = s.idp"; + $sql .= " WHERE 1=1"; + if ($year) { + $sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'"; } } -$sql .= " GROUP BY nom ASC, idp"; +$sql .= " GROUP BY nom, idp"; +$sql .= " ORDER BY nom, idp"; print ''; $subtotal_ht = 0; @@ -154,7 +200,7 @@ if ($result) { print ""; print "\n"; - print "\n"; + if ($modecompta == 'CREANCES-DETTES') print "\n"; print "\n"; $total_ht = $total_ht - $objp->amount_ht; @@ -170,109 +216,151 @@ if ($result) { dolibarr_print_error($db); } print ''; -print ''; -print ''; -print ''; - -/* - * Charges sociales - */ - -$subtotal = 0; -print ''; - -$sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; -$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; -$sql .= " WHERE s.fk_type = c.id AND c.deductible=1"; -if ($year) { - $sql .= " AND s.date_ech between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; -} -$sql .= " GROUP BY c.libelle DESC"; - -if ( $db->query($sql) ) { - $num = $db->num_rows(); - $i = 0; - - while ($i < $num) { - $obj = $db->fetch_object(); - - $total_ht = $total_ht - $obj->amount; - $total_ttc = $total_ttc - $obj->amount; - $subtotal_ht = $subtotal_ht + $obj->amount; - $subtotal_ttc = $subtotal_ttc + $obj->amount; - - $var = !$var; - print ""; - print ''; - print ''; - print ''; - $i++; - } -} else { - dolibarr_print_error($db); -} -print ''; -print ''; +if ($modecompta == 'CREANCES-DETTES') print ''; print ''; print ''; -print ''; -print ''; -print ''; -print ''; /* * Charges sociales non déductibles */ -$subtotal = 0; print ''; -$sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; -$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; -$sql .= " WHERE s.fk_type = c.id AND c.deductible=0"; -if ($year) { - $sql .= " AND s.date_ech between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; +if ($modecompta == 'CREANCES-DETTES') { + $sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; + $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; + $sql .= " WHERE s.fk_type = c.id AND c.deductible=0"; + if ($year) { + $sql .= " AND s.date_ech between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; + } + $sql .= " GROUP BY c.libelle"; } -$sql .= " GROUP BY c.libelle DESC"; - -if ( $db->query($sql) ) { - $num = $db->num_rows(); - $i = 0; - - while ($i < $num) { - $obj = $db->fetch_object(); - - $total_ht = $total_ht - $obj->amount; - $total_ttc = $total_ttc - $obj->amount; - $subtotal_ht = $subtotal_ht + $obj->amount; - $subtotal_ttc = $subtotal_ttc + $obj->amount; - - $var = !$var; - print ""; - print ''; - print ''; - print ''; - print ''; - $i++; - } +else { + $sql = "SELECT c.libelle as nom, sum(p.amount) as amount"; + $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p"; + $sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=0"; + if ($year) { + $sql .= " AND p.datep between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; + } + $sql .= " GROUP BY c.libelle"; +} +$result=$db->query($sql); +$subtotal_ht = 0; +$subtotal_ttc = 0; +if ($result) { + $num = $db->num_rows($result); + $var=false; + $i = 0; + if ($num) { + while ($i < $num) { + $obj = $db->fetch_object($result); + + $total_ht = $total_ht - $obj->amount; + $total_ttc = $total_ttc - $obj->amount; + $subtotal_ht = $subtotal_ht + $obj->amount; + $subtotal_ttc = $subtotal_ttc + $obj->amount; + + $var = !$var; + print ""; + print ''; + if ($modecompta == 'CREANCES-DETTES') print ''; + print ''; + print ''; + $i++; + } + } + else { + print ""; + print ''; + print ''; + } } else { dolibarr_print_error($db); } print ''; -print ''; +if ($modecompta == 'CREANCES-DETTES') print ''; print ''; print ''; +/* + * Charges sociales déductibles + */ + +print ''; + +if ($modecompta == 'CREANCES-DETTES') { + $sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; + $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; + $sql .= " WHERE s.fk_type = c.id AND c.deductible=1"; + if ($year) { + $sql .= " AND s.date_ech between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; + } + $sql .= " GROUP BY c.libelle DESC"; +} +else { + $sql = "SELECT c.libelle as nom, sum(p.amount) as amount"; + $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p"; + $sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=1"; + if ($year) { + $sql .= " AND p.datep between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; + } + $sql .= " GROUP BY c.libelle"; +} +$result=$db->query($sql); +$subtotal_ht = 0; +$subtotal_ttc = 0; +if ($result) { + $num = $db->num_rows($result); + $var=false; + $i = 0; + if ($num) { + while ($i < $num) { + $obj = $db->fetch_object($result); + + $total_ht = $total_ht - $obj->amount; + $total_ttc = $total_ttc - $obj->amount; + $subtotal_ht = $subtotal_ht + $obj->amount; + $subtotal_ttc = $subtotal_ttc + $obj->amount; + + $var = !$var; + print ""; + print ''; + if ($modecompta == 'CREANCES-DETTES') print ''; + print ''; + print ''; + $i++; + } + } + else { + print ""; + print ''; + print ''; + } +} else { + dolibarr_print_error($db); +} +print ''; +if ($modecompta == 'CREANCES-DETTES') print ''; +print ''; +print ''; + + +// Total + +print ""; +print ''; +print ''; + print ''; -print ''; +if ($modecompta == 'CREANCES-DETTES') print ''; print ''; print ''; print "
 '.$langs->trans("Element").'".$langs->trans("AmountHT")."".$langs->trans("AmountHT")."".$langs->trans("AmountTTC")."
Facturation clients
 ".$langs->trans("Factures")." idp\">$objp->nom".$langs->trans("Bills")." idp\">$objp->nom".price($objp->amount_ht)."".price($objp->amount_ht)."".price($objp->amount_ttc)."
 ".$langs->trans("Bills")." ".$langs->trans("Other")."\n"; + + if ($modecompta == 'CREANCES-DETTES') print "".price($objp->amount_ht)."".price($objp->amount_ttc)."
'.price($total_ht).''.price($total_ttc).''.price($total_ht).''.price($total_ttc).'
Facturation fournisseurs
 ".$langs->trans("Bills")." idp."\">$objp->nom".price($objp->amount_ht)."".price($objp->amount_ht)."".price($objp->amount_ttc)."
'.price($subtotal_ht).''.price($subtotal_ttc).'
Prestations/Charges déductibles
 '.$obj->nom.''.price($obj->amount).'
'.price($subtotal_ht).''.price($subtotal_ht).''.price($subtotal_ttc).'
Résultat'.price($total_ht).''.price($total_ttc).'
Prestations/Charges NON déductibles
 '.$obj->nom.''.price($obj->amount).''.price($obj->amount).'
 '.$obj->nom.''.price($obj->amount).''.price($obj->amount).'
 '.$langs->trans("None").'
'.price($subtotal_ht).''.price($subtotal_ht).''.price($subtotal_ttc).'
Prestations/Charges déductibles
 '.$obj->nom.''.price($obj->amount).''.price($obj->amount).'
 '.$langs->trans("None").'
'.price($subtotal_ht).''.price($subtotal_ttc).'
 
Résultat'.price($total_ht).''.price($total_ht).''.price($total_ttc).'
"; - +print '
'; $db->close(); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 04f560f4176..fe8487c8dc2 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -54,7 +54,7 @@ $modecompta = $conf->compta->mode; if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; -$title="Résultat comptable (HT), résumé annuel"; +$title="Résultat exercice, résumé annuel"; $lien=($year_start?"".img_previous()." ".img_next()."":""); print_fiche_titre($title,$lien); print '
'; @@ -76,21 +76,22 @@ else { /* * Factures clients */ -if ($conf->compta->mode == 'CREANCES-DETTES') { - $sql = "SELECT sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm"; +if ($modecompta == 'CREANCES-DETTES') { + $sql = "SELECT sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1"; } else { - $sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; - $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p "; - $sql .= "left join ".MAIN_DB_PREFIX."facture as f "; - $sql .= "on f.rowid = p.fk_facture"; + $sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; + $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f"; + $sql .= " ON f.rowid = p.fk_facture"; + $sql .= " WHERE 1=1"; } if ($socidp) { $sql .= " AND f.fk_soc = $socidp"; } -$sql .= " GROUP BY dm DESC"; +$sql .= " GROUP BY dm"; $result=$db->query($sql); @@ -115,15 +116,16 @@ else { /* * Frais, factures fournisseurs. */ -if ($conf->compta->mode == 'CREANCES-DETTES') { - $sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm"; +if ($modecompta == 'CREANCES-DETTES') { + $sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1"; } else { $sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; - $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p "; - $sql .= "left join ".MAIN_DB_PREFIX."facture_fourn as f "; - $sql .= "on f.rowid = p.fk_facture_fourn"; + $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f"; + $sql .= " ON f.rowid = p.fk_facture_fourn"; + $sql .= " WHERE 1=1"; } if ($socidp) { @@ -180,19 +182,19 @@ for ($mois = 1 ; $mois < 13 ; $mois++) { print ' '; $case = strftime("%Y-%m",mktime(1,1,1,$mois,1,$annee)); - if ($encaiss[$case]>0) + if ($encaiss_ttc[$case]>0) { - print price($encaiss[$case]); - $totentrees[$annee]+=$encaiss[$case]; + print price($encaiss_ttc[$case]); + $totentrees[$annee]+=$encaiss_ttc[$case]; } print ""; print ' '; $case = strftime("%Y-%m",mktime(1,1,1,$mois,1,$annee)); - if ($decaiss[$case]>0) + if ($decaiss_ttc[$case]>0) { - print price($decaiss[$case]); - $totsorties[$annee]+=$decaiss[$case]; + print price($decaiss_ttc[$case]); + $totsorties[$annee]+=$decaiss_ttc[$case]; } print ""; } @@ -201,7 +203,7 @@ for ($mois = 1 ; $mois < 13 ; $mois++) } $var=!$var; -print "".$langs->trans("Total").""; +print "".$langs->trans("TotalTTC").""; for ($annee = $year_start ; $annee <= $year_end ; $annee++) { print ''.price($totentrees[$annee]).''.price($totsorties[$annee]).''; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 666e6b84542..5a9f6441747 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -79,7 +79,7 @@ else { print '
'; -if ($conf->compta->mode == 'CREANCES-DETTES') { +if ($modecompta == 'CREANCES-DETTES') { $sql = "SELECT sum(f.total) as amount, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " WHERE f.fk_statut = 1"; @@ -197,17 +197,17 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) print "".$langs->trans("Total")." :"; for ($annee = $year_start ; $annee <= $year_end ; $annee++) { - print "".($total[$annee]?price($total[$annee]):" ").""; + print "".($total[$annee]?price($total[$annee]):" ").""; // Pourcentage evol if ($total[$annee-1]) { if ($annee <= $year_current) { if ($total[$annee-1]) { $percent=(round(($total[$annee]-$total[$annee-1])/$total[$annee-1],4)*100); - print ''.($percent>=0?"+$percent":"$percent").'%'; + print ''.($percent>=0?"+$percent":"$percent").'%'; } else - print '+Inf%'; + print '+Inf%'; } else { @@ -228,17 +228,16 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) } print "\n"; -/* en mode recettes/dépenses, il faut compléter avec les montants facturés non réglés -* et les propales signées mais pas facturées -* en effet, en recettes-dépenses, on comptabilise lorsque le montant est sur le compte -* donc il est intéressant d'avoir une vision de ce qui va arriver -*/ -if ($conf->compta->mode != 'CREANCES-DETTES') { + /* -* -* Facture non réglées -* -*/ + * En mode recettes/dépenses, on complète avec les montants facturés non réglés + * et les propales signées mais pas facturées. En effet, en recettes-dépenses, + * on comptabilise lorsque le montant est sur le compte donc il est intéressant + * d'avoir une vision de ce qui va arriver. + */ +if ($modecompta != 'CREANCES-DETTES') { + + // Factures non réglées $sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total_ttc, sum(pf.amount) as am"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture"; diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 98088f54080..b72667c9f9a 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -21,7 +21,7 @@ VATPayed=VAT payed SocialContributions=Social contributions AccountancyTreasuryArea=Accountancy/Treasury area NewPayment=New payment -RulesResultDue=- Les dépenses de charges ne sont pas incluses.
- Il se base sur la date de validation des factures.
- Il inclut les factures dues, qu'elles soient payées ou non
-RulesResultInOut=- Les dépenses de charges ne sont pas incluses.
- Il se base sur les paiements des factures effectivement réalisés
+RulesResultDue=Cet état permet de faire un bilan des recettes et dépenses:
- Il se base sur la date de validation pour les factures, les dates d'échéances pour les charges.
- Il inclut les factures et charges dues, qu'elles soient payées ou non.
+RulesResultInOut=Cet état permet de faire un bilan des recettes et dépenses:
- Il se base sur les paiements effectivement réalisées des factures et charges.
RulesCADue=- Il se base sur la date de validation des factures.
- Il se base sur les factures dues, qu'elles soient payées ou non
RulesCAIn=- Il se base sur la date des paiements de factures
- Il se base sur les paiements des factures effectivement réalisés
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 6167a085335..8d13a0753ce 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -22,7 +22,7 @@ SocialContributions=Charges sociales AccountancyTreasuryArea=Espace Compta/Tréso NewPayment=Nouveau paiement ListPayment=Liste des paiements -RulesResultDue=- Les dépenses de charges ne sont pas incluses.
- Il se base sur la date de validation des factures.
- Il inclut les factures dues, qu'elles soient payées ou non
-RulesResultInOut=- Les dépenses de charges ne sont pas incluses.
- Il se base sur les paiements des factures effectivement réalisés
-RulesCADue=- Il se base sur la date de validation des factures.
- Il se base sur les factures dues, qu'elles soient payées ou non
-RulesCAIn=- Il se base sur la date des paiements de factures
- Il se base sur les paiements des factures effectivement réalisés
+RulesResultDue=- Il se base sur la date de validation pour les factures, les dates d'échéances pour les charges.
- Il inclut les factures et charges dues, qu'elles soient payées ou non.
+RulesResultInOut=- Il se base sur les paiements effectivement réalisées des factures et charges.
+RulesCADue=- Il se base sur la date de validation des factures.
- Il se base sur les factures dues, qu'elles soient payées ou non.
+RulesCAIn=- Il se base sur la date des paiements de factures
- Il se base sur les paiements des factures effectivement réalisés.