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

Fix: Le calcul du rsultat en mode recettes-dpenses se base enfin sur la date rel du paiement.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-07 21:21:44 +00:00
parent 7b62358b15
commit 8f10b07960
5 changed files with 147 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,12 +44,12 @@ print '<br>';
if ($modecompta=="CREANCES-DETTES") if ($modecompta=="CREANCES-DETTES")
{ {
print 'Il se base sur la date de validation des factures et inclut les factures dues, qu\'elles soient payées ou non'; print $langs->trans("RulesResultDue");
print '(Voir le rapport <a href="clientfourn.php?year='.$year.'&modecompta=RECETTES-DEPENSES">recettes-dépenses</a> pour n\'inclure que les factures effectivement payées).<br>'; print '(Voir le rapport <a href="clientfourn.php?year='.$year.'&modecompta=RECETTES-DEPENSES">recettes-dépenses</a> pour n\'inclure que les factures effectivement payées).<br>';
print '<br>'; print '<br>';
} }
else { else {
print 'Il se base sur la date de validation des factures et n\'inclut que les factures effectivement payées'; print $langs->trans("RulesResultInOut");
print '(Voir le rapport en <a href="clientfourn.php?year='.$year.'&modecompta=CREANCES-DETTES">créances-dettes</a> pour inclure les factures non encore payée).<br>'; print '(Voir le rapport en <a href="clientfourn.php?year='.$year.'&modecompta=CREANCES-DETTES">créances-dettes</a> pour inclure les factures non encore payée).<br>';
print '<br>'; print '<br>';
} }
@ -57,7 +57,7 @@ else {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="10%">&nbsp;</td><td>Elément</td>'; print '<td width="10%">&nbsp;</td><td>'.$langs->trans("Element").'</td>';
print "<td align=\"right\">".$langs->trans("AmountHT")."</td>"; print "<td align=\"right\">".$langs->trans("AmountHT")."</td>";
print "<td align=\"right\">".$langs->trans("AmountTTC")."</td>"; print "<td align=\"right\">".$langs->trans("AmountTTC")."</td>";
print "</tr>\n"; print "</tr>\n";
@ -66,29 +66,34 @@ print "</tr>\n";
/* /*
* Factures clients * Factures clients
*/ */
if ($conf->compta->mode == 'CREANCES-DETTES') {
$sql = "SELECT s.nom, s.idp, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc"; $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"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1";
if ($year) { if ($_GET["year"]) {
$sql .= " AND f.datef between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; $sql .= " AND f.datef between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'";
} }
if ($modecompta != 'CREANCES-DETTES') { } else {
$sql .= " AND f.paye = 1"; $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'";
} }
$sql .= " GROUP BY s.nom ASC"; }
$sql .= " GROUP BY nom ASC";
print '<tr><td colspan="4">Facturation clients</td></tr>'; print '<tr><td colspan="4">Facturation clients</td></tr>';
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $i = 0;
$var=true;
if ($num > 0) { while ($i < $num)
$var=True; {
while ($i < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
@ -103,8 +108,7 @@ if ($result) {
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }
} $db->free($result);
$db->free();
} else { } else {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
@ -116,26 +120,31 @@ print '</tr>';
/* /*
* Frais, factures fournisseurs. * Frais, factures fournisseurs.
*/ */
if ($conf->compta->mode == 'CREANCES-DETTES') {
$sql = "SELECT s.nom, s.idp, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc"; $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 .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f";
$sql .= " WHERE f.fk_soc = s.idp"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1";
if ($year) { if ($_GET["year"]) {
$sql .= " AND f.datef between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'"; $sql .= " AND f.datef between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'";
} }
if ($modecompta != 'CREANCES-DETTES') { } else {
$sql .= " AND f.paye = 1"; $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 .= " GROUP BY s.nom ASC, s.idp"; }
$sql .= " GROUP BY nom ASC, idp";
print '<tr><td colspan="4">Facturation fournisseurs</td></tr>'; print '<tr><td colspan="4">Facturation fournisseurs</td></tr>';
$subtotal_ht = 0; $subtotal_ht = 0;
$subtotal_ttc = 0; $subtotal_ttc = 0;
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $i = 0;
if ($num > 0) { if ($num > 0) {
$var=True; $var=True;
while ($i < $num) { while ($i < $num) {
@ -156,7 +165,7 @@ if ($result) {
$i++; $i++;
} }
} }
$db->free(); $db->free($result);
} else { } else {
dolibarr_print_error($db); dolibarr_print_error($db);
} }

45
htdocs/compta/resultat/index.php
View File

@ -54,42 +54,45 @@ $modecompta = $conf->compta->mode;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
$title="Résultat comptable, résumé annuel"; $title="Résultat comptable (HT), résumé annuel";
$lien=($year_start?"<a href='index.php?year_start=".($year_start-1)."'>".img_previous()."</a> <a href='index.php?year_start=".($year_start+1)."'>".img_next()."</a>":""); $lien=($year_start?"<a href='index.php?year_start=".($year_start-1)."'>".img_previous()."</a> <a href='index.php?year_start=".($year_start+1)."'>".img_next()."</a>":"");
print_fiche_titre($title,$lien); print_fiche_titre($title,$lien);
print '<br>'; print '<br>';
print "Ce rapport présente la balance entre les recettes et les dépenses facturées aux clients ou fournisseurs. Les dépenses de charges ne sont pas incluses.<br>\n"; // Affiche règles de calcul
print "Ce rapport présente la balance entre les recettes et les dépenses facturées aux clients ou fournisseurs:<br>\n";
if ($modecompta=="CREANCES-DETTES") if ($modecompta=="CREANCES-DETTES")
{ {
print 'Il se base sur la date de validation des factures et inclut les factures dues, qu\'elles soient payées ou non'; print $langs->trans("RulesResultDue");
print ' (Voir le rapport <a href="index.php?year='.$year.'&modecompta=RECETTES-DEPENSES">recettes-dépenses</a> pour n\'inclure que les factures effectivement payées).<br>'; print '(Voir le rapport <a href="index.php?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">recettes-dépenses</a> pour n\'inclure que les factures effectivement payées).<br>';
print '<br>'; print '<br>';
} }
else { else {
print 'Il se base sur la date de validation des factures et n\'inclut que les factures effectivement payées'; print $langs->trans("RulesResultInOut");
print ' (Voir le rapport en <a href="index.php?year='.$year.'&modecompta=CREANCES-DETTES">créances-dettes</a> pour inclure les factures non encore payée).<br>'; print '(Voir le rapport en <a href="index.php?year_start='.$year_start.'&modecompta=CREANCES-DETTES">créances-dettes</a> pour inclure les factures non encore payée).<br>';
print '<br>'; print '<br>';
} }
/* /*
* Factures clients * 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"; $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 .= " 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"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1";
if ($_GET["year"]) { } else {
$sql .= " AND f.datef between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'"; $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";
} }
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
} }
if ($modecompta != 'CREANCES-DETTES') {
$sql .= " AND f.paye = 1";
}
$sql .= " GROUP BY dm DESC"; $sql .= " GROUP BY dm DESC";
$result=$db->query($sql); $result=$db->query($sql);
if ($result) if ($result)
{ {
@ -102,28 +105,30 @@ if ($result)
$encaiss_ttc[$row->dm] = $row->amount_ttc; $encaiss_ttc[$row->dm] = $row->amount_ttc;
$i++; $i++;
} }
$db->free($result);
} }
else { else {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
$db->free($result);
/* /*
* Frais, factures fournisseurs. * 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"; $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 .= " 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"; $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut = 1";
if ($_GET["year"]) { } else {
$sql .= " AND f.datef between '".$_GET["year"]."-01-01 00:00:00' and '".$_GET["year"]."-12-31 23:59:59'"; $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";
} }
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
} }
if ($modecompta != 'CREANCES-DETTES') {
$sql .= " AND f.paye = 1";
}
$sql .= " GROUP BY dm DESC"; $sql .= " GROUP BY dm DESC";
$result=$db->query($sql); $result=$db->query($sql);
@ -138,14 +143,16 @@ if ($result)
$decaiss_ttc[$row->dm] = $row->amount_ttc; $decaiss_ttc[$row->dm] = $row->amount_ttc;
$i++; $i++;
} }
$db->free($result);
} }
else { else {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
$db->free($result);
/* /*
* Tableau * Affiche tableau
*/ */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

40
htdocs/compta/stats/index.php
View File

@ -50,21 +50,37 @@ if ($user->societe_id > 0)
$socidp = $user->societe_id; $socidp = $user->societe_id;
} }
$mode='recettes'; $modecompta = $conf->compta->mode;
if ($conf->compta->mode == 'CREANCES-DETTES') { $mode='creances'; } if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
if ($mode=='creances') { if ($modecompta=='CREANCES-DETTES') {
$title="Chiffre d'affaire (".$conf->monnaie." HT, ".$mode.")"; $title="Chiffre d'affaire (".$conf->monnaie." HT)";
} else { } else {
$title="Chiffre d'affaire (".$conf->monnaie." TTC, ".$mode.")"; $title="Chiffre d'affaire (".$conf->monnaie." TTC)";
} }
$lien=($year_start?"<a href='index.php?year_start=".($year_start-1)."'>".img_previous()."</a> <a href='index.php?year_start=".($year_start+1)."'>".img_next()."</a>":""); $lien=($year_start?"<a href='index.php?year_start=".($year_start-1)."'>".img_previous()."</a> <a href='index.php?year_start=".($year_start+1)."'>".img_next()."</a>":"");
print_fiche_titre($title,$lien); print_fiche_titre($title,$lien);
// Affiche règles de calcul
print "Ce rapport présente le CA:<br>\n";
if ($modecompta=="CREANCES-DETTES")
{
print $langs->trans("RulesCADue");
print '(Voir le rapport <a href="index.php?year_start='.($year_start).'&modecompta=RECETTES-DEPENSES">recettes-dépenses</a> pour n\'inclure que les factures effectivement payées).<br>';
print '<br>';
}
else {
print $langs->trans("RulesCAIn");
print '(Voir le rapport en <a href="index.php?year_start='.($year_start).'&modecompta=CREANCES-DETTES">créances-dettes</a> pour inclure les factures non encore payée).<br>';
print '<br>';
}
print '<br>'; print '<br>';
if ($conf->compta->mode == 'CREANCES-DETTES') { if ($conf->compta->mode == 'CREANCES-DETTES') {
$sql = "SELECT sum(f.total) as amount , date_format(f.datef,'%Y-%m') as dm"; $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 .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE f.fk_statut = 1"; $sql .= " WHERE f.fk_statut = 1";
$sql .= " AND f.paye = 1"; $sql .= " AND f.paye = 1";
@ -78,24 +94,28 @@ if ($conf->compta->mode == 'CREANCES-DETTES') {
$sql .= "left join ".MAIN_DB_PREFIX."facture as f "; $sql .= "left join ".MAIN_DB_PREFIX."facture as f ";
$sql .= "on f.rowid = p.fk_facture"; $sql .= "on f.rowid = p.fk_facture";
} }
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
} }
$sql .= " GROUP BY dm DESC"; $sql .= " GROUP BY dm DESC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row($i); $obj = $db->fetch_object($result);
$cum[$row[1]] = $row[0]; $cum[$obj->dm] = $obj->amount;
$i++; $i++;
} }
$db->free($result);
}
else {
dolibarr_print_error($db);
} }
print '<table width="100%" class="noborder">'; print '<table width="100%" class="noborder">';

4
htdocs/langs/en_US/compta.lang
View File

@ -21,3 +21,7 @@ VATPayed=VAT payed
SocialContributions=Social contributions SocialContributions=Social contributions
AccountancyTreasuryArea=Accountancy/Treasury area AccountancyTreasuryArea=Accountancy/Treasury area
NewPayment=New payment NewPayment=New payment
RulesResultDue=- Les dépenses de charges ne sont pas incluses.<br>- Il se base sur la date de validation des factures.<br>- Il inclut les factures dues, qu'elles soient payées ou non<br>
RulesResultInOut=- Les dépenses de charges ne sont pas incluses.<br>- Il se base sur les paiements des factures effectivement réalisés<br>
RulesCADue=- Il se base sur la date de validation des factures.<br>- Il se base sur les factures dues, qu'elles soient payées ou non<br>
RulesCAIn=- Il se base sur la date des paiements de factures<br>- Il se base sur les paiements des factures effectivement réalisés<br>

4
htdocs/langs/fr_FR/compta.lang
View File

@ -22,3 +22,7 @@ SocialContributions=Charges sociales
AccountancyTreasuryArea=Espace Compta/Tréso AccountancyTreasuryArea=Espace Compta/Tréso
NewPayment=Nouveau paiement NewPayment=Nouveau paiement
ListPayment=Liste des paiements ListPayment=Liste des paiements
RulesResultDue=- Les dépenses de charges ne sont pas incluses.<br>- Il se base sur la date de validation des factures.<br>- Il inclut les factures dues, qu'elles soient payées ou non<br>
RulesResultInOut=- Les dépenses de charges ne sont pas incluses.<br>- Il se base sur les paiements des factures effectivement réalisés<br>
RulesCADue=- Il se base sur la date de validation des factures.<br>- Il se base sur les factures dues, qu'elles soient payées ou non<br>
RulesCAIn=- Il se base sur la date des paiements de factures<br>- Il se base sur les paiements des factures effectivement réalisés<br>