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

Qual: Reorganisation menu du module tax et charges pour meilleure comprhension.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-10-07 03:43:15 +00:00
parent d93a9d6a57
commit 91193f7edb
7 changed files with 145 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/bank/index.php
View File

@ -29,8 +29,8 @@
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
require("../../tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/tva.class.php");
require("../../chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/chargesociales.class.php");
$langs->load("banks"); $langs->load("banks");

164
htdocs/compta/charges/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,6 +28,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/tva.class.php");
$user->getrights('compta'); $user->getrights('compta');
$user->getrights('tax'); $user->getrights('tax');
@ -42,89 +43,126 @@ if (! $year) { $year=date("Y", time()); }
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("Charges"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":"")); print_fiche_titre($langs->trans("TaxAndDividendsArea"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
print "<br>"; print "<br>";
/*
* Charges sociales
*/
print_titre($langs->trans("SocialContributions"));
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print "<td>".$langs->trans("Group")."</td>"; print "<td>".$langs->trans("Type")."</td>";
print "<td align=\"right\">".$langs->trans("Nb")."</td>"; print "<td align=\"right\">".$langs->trans("Nb")."</td>";
print "<td align=\"right\">".$langs->trans("AmountTTC")."</td>"; print "<td align=\"right\">".$langs->trans("Amount")."</td>";
print "<td align=\"right\">".$langs->trans("AlreadyPayed")."</td>"; print "<td align=\"right\">".$langs->trans("AlreadyPayed")."</td>";
print "</tr>\n"; print "</tr>\n";
/* $sql = "SELECT c.libelle as lib, s.fk_type as type,";
* Charges sociales $sql.=" count(s.rowid) as nb, sum(s.amount) as total, sum(IF(paye=1,s.amount,0)) as totalpaye";
*/ $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
$sql = "SELECT c.libelle as lib, s.fk_type as type, count(s.rowid) as nb, sum(s.amount) as total, sum(IF(paye=1,s.amount,0)) as totalpaye"; $sql.= " WHERE s.fk_type = c.id";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
$sql .= " WHERE s.fk_type = c.id";
if ($year > 0) if ($year > 0)
{ {
$sql .= " AND ("; $sql .= " AND (";
// Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance, // Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance,
// ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire // ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire
$sql .= " (s.periode is not null and date_format(s.periode, '%Y') = $year) "; $sql .= " (s.periode is not null and date_format(s.periode, '%Y') = $year) ";
$sql .= "or (s.periode is null and date_format(s.date_ech, '%Y') = $year)"; $sql .= "or (s.periode is null and date_format(s.date_ech, '%Y') = $year)";
$sql .= ")"; $sql .= ")";
} }
$sql .= " GROUP BY lower(c.libelle) ASC"; $sql .= " GROUP BY c.libelle ASC";
if ( $db->query($sql) ) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$var=true; $total = 0;
$totalpaye = 0;
while ($i < $num) { $var=true;
$obj = $db->fetch_object();
$var = !$var;
print "<tr $bc[$var]>";
print '<td><a href="../sociales/index.php?filtre=s.fk_type:'.$obj->type.'">'.$obj->lib.'</a></td>';
print '<td align="right">'.$obj->nb.'</td>';
print '<td align="right">'.price($obj->total).'</td>';
print '<td align="right">'.price($obj->totalpaye).'</td>';
print '</tr>';
$i++;
}
} else {
dolibarr_print_error($db);
}
/** while ($i < $num)
* Factures fournisseurs {
*/ $obj = $db->fetch_object($resql);
$sql = "SELECT count(f.rowid) as nb, sum(total_ttc) as total, sum(IF(paye=1,total_ttc,0)) as totalpaye"; $var = !$var;
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; print "<tr $bc[$var]>";
print '<td><a href="../sociales/index.php?filtre=s.fk_type:'.$obj->type.'">'.$obj->lib.'</a></td>';
print '<td align="right">'.$obj->nb.'</td>';
print '<td align="right">'.price($obj->total).'</td>';
print '<td align="right">'.price($obj->totalpaye).'</td>';
print '</tr>';
$total = $total + $obj->total;
$totalpaye = $totalpaye + $obj->totalpaye;
$i++;
}
print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
print '<td align="right"><b>'.price($total)."</b></td>";
print '<td align="right"><b>'.price($totalpaye)."</b></td>";
print "</tr>";
}
else
{
dolibarr_print_error($db);
}
print '</table>';
print "<br>";
$tva = new Tva($db);
print_titre($langs->trans("VATPayments"));
$sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."tva as f ";
if ($year > 0) if ($year > 0)
{ {
$sql .= " WHERE date_format(f.datef, '%Y') = $year"; // Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance,
// ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire
$sql .= " WHERE date_format(f.datev, '%Y') = ".$year;
} }
$sql .= " ORDER BY dm DESC";
if ( $db->query($sql) ) { $result = $db->query($sql);
if ($result)
$langs->load("compta"); {
$num = $db->num_rows($result);
$num = $db->num_rows(); $i = 0;
$i = 0; $total = 0 ;
print '<table class="noborder" width="100%">';
while ($i < $num) { print '<tr class="liste_titre">';
$obj = $db->fetch_object(); print '<td nowrap>'.$langs->trans("Date").'</td>';
$var = !$var; print "<td>".$langs->trans("Label")."</td>";
print "<tr $bc[$var]>"; print '<td align="right">'.$langs->trans("Amount")."</td>";
print '<td>'.$langs->trans("BillsForSuppliers").'</td>'; print "</tr>\n";
print '<td align="right">'.$obj->nb.'</td>'; $var=1;
print '<td align="right">'.price($obj->total).'</td>'; while ($i < $num)
print '<td align="right">'.price($obj->totalpaye).'</td>'; {
print '</tr>'; $obj = $db->fetch_object($result);
$i++; $var=!$var;
} print "<tr $bc[$var]>";
} else { print '<td align="left">'.dolibarr_print_date($obj->dm,'day')."</td>\n";
print "<td>".$obj->label."</td>\n";
$total = $total + $obj->amount;
print "<td align=\"right\">".price($obj->amount)."</td>";
print "</tr>\n";
$i++;
}
print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
print '<td align="right"><b>'.price($total)."</b></td></tr>";
print "</table>";
$db->free($result);
}
else
{
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</table><br>";
$db->close(); $db->close();

12
htdocs/compta/tva/reglement.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -27,7 +26,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require("../../tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/tva.class.php");
$langs->load("compta"); $langs->load("compta");
$langs->load("compta"); $langs->load("compta");
@ -52,10 +51,9 @@ if ($result)
print '<br>'; print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td nowrap width="120">'.$langs->trans("Date").'</td>'; print '<td nowrap align="left">'.$langs->trans("Date").'</td>';
print "<td>".$langs->trans("Label")."</td>"; print "<td>".$langs->trans("Label")."</td>";
print "<td align=\"right\">".$langs->trans("Amount")."</td>"; print "<td align=\"right\">".$langs->trans("Amount")."</td>";
print "<td>&nbsp;</td>\n";
print "</tr>\n"; print "</tr>\n";
$var=1; $var=1;
while ($i < $num) while ($i < $num)
@ -63,17 +61,17 @@ if ($result)
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td>".dolibarr_print_date($obj->dm)."</td>\n"; print '<td align="left">'.dolibarr_print_date($obj->dm,'day')."</td>\n";
print "<td>".$obj->label."</td>\n"; print "<td>".$obj->label."</td>\n";
$total = $total + $obj->amount; $total = $total + $obj->amount;
print "<td align=\"right\">".price($obj->amount)."</td><td>&nbsp;</td>"; print "<td align=\"right\">".price($obj->amount)."</td>";
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }
print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
print "<td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>"; print "<td align=\"right\"><b>".price($total)."</b></td></tr>";
print "</table>"; print "</table>";
$db->free($result); $db->free($result);

29
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -453,22 +453,23 @@ class MenuLeft {
if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/fiche.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=accountancy", $langs->trans("New"), 1, $user->rights->deplacement->lire); if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/fiche.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=accountancy", $langs->trans("New"), 1, $user->rights->deplacement->lire);
if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire);
} }
// Charges sociales
// Taxes et charges sociales
if ($conf->tax->enabled) if ($conf->tax->enabled)
{ {
$newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=charges&amp;mainmenu=accountancy",$langs->trans("Charges"), 0, $user->rights->tax->charges->lire); $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy",$langs->trans("MenuTaxAndDividends"), 0, $user->rights->tax->charges->lire);
if ($leftmenu=="charges") $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/charges.php?action=create",$langs->trans("MenuNewSocialContribution"), 1, $user->rights->tax->charges->creer); if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy",$langs->trans("MenuSocialContributions"),1,$user->rights->tax->charges->lire);
if ($leftmenu=="charges") $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php",$langs->trans("List"), 1, $user->rights->tax->charges->lire); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/charges.php?leftmenu=tax_social&action=create",$langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
} if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php?leftmenu=tax_social",$langs->trans("List"), 2, $user->rights->tax->charges->lire);
// VAT
// Charges tva if ($conf->compta->tva)
if ($user->rights->tax->charges->lire && $conf->compta->tva && $user->societe_id == 0) {
{ if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy",$langs->trans("VAT"),1,$user->rights->tax->charges->lire);
$newmenu->add(DOL_URL_ROOT."/compta/tva/index.php?leftmenu=vat&amp;mainmenu=accountancy",$langs->trans("VAT"),0,$user->rights->tax->charges->lire); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/fiche.php?action=create",$langs->trans("NewPayment"),1,$user->rights->tax->charges->creer); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/reglement.php?leftmenu=tax_vat",$langs->trans("List"),2,$user->rights->tax->charges->lire);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/reglement.php",$langs->trans("Payments"),1,$user->rights->tax->charges->lire); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/clients.php", $langs->trans("ReportByCustomers"), 1, $user->rights->tax->charges->lire); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/quadri_detail.php", $langs->trans("ReportByQuarter"), 1, $user->rights->tax->charges->lire); }
} }
// Compta simple // Compta simple

31
htdocs/includes/menus/barre_left/eldy_frontoffice.php
View File

@ -451,26 +451,23 @@ class MenuLeft {
if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire);
} }
// Charges sociales // Taxes et charges sociales
/*
if ($conf->tax->enabled) if ($conf->tax->enabled)
{ {
$newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=charges&amp;mainmenu=accountancy",$langs->trans("Charges"), 0, $user->rights->tax->charges->lire); $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy",$langs->trans("MenuTaxAndDividends"), 0, $user->rights->tax->charges->lire);
if ($leftmenu=="charges") $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php",$langs->trans("SocialContributions"), 1, $user->rights->tax->charges->lire); if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy",$langs->trans("MenuSocialContributions"),1,$user->rights->tax->charges->lire);
if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/charges.php?leftmenu=tax_social&action=create",$langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php?leftmenu=tax_social",$langs->trans("List"), 2, $user->rights->tax->charges->lire);
// VAT
if ($conf->compta->tva)
{
if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy",$langs->trans("VAT"),1,$user->rights->tax->charges->lire);
if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/reglement.php?leftmenu=tax_vat",$langs->trans("List"),2,$user->rights->tax->charges->lire);
if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
}
} }
*/
// Charges tva
/*
if ($user->rights->tax->charges->lire && $conf->compta->tva && $user->societe_id == 0)
{
$newmenu->add(DOL_URL_ROOT."/compta/tva/index.php?leftmenu=vat&amp;mainmenu=accountancy",$langs->trans("VAT"),0,$user->rights->tax->charges->lire);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/fiche.php?action=create",$langs->trans("NewPayment"),1,$user->rights->tax->charges->creer);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/reglement.php",$langs->trans("Payments"),1,$user->rights->tax->charges->lire);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/clients.php", $langs->trans("ReportByCustomers"), 1, $user->rights->tax->charges->lire);
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/quadri_detail.php", $langs->trans("ReportByQuarter"), 1, $user->rights->tax->charges->lire);
}
*/
// Compta simple // Compta simple
/* /*

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

@ -28,9 +28,12 @@ VATToCollect=VAT to collect
VATSummary=VAT Summary VATSummary=VAT Summary
VATPayed=VAT payed VATPayed=VAT payed
VATCollected=VAT collected VATCollected=VAT collected
TaxAndDividendsArea=Tax, social contributions and dividends area
SocialContribution=Social contribution SocialContribution=Social contribution
SocialContributions=Social contributions SocialContributions=Social contributions
MenuNewSocialContribution=New social contribution MenuTaxAndDividends=Taxes and dividends
MenuSocialContributions=Social contributions
MenuNewSocialContribution=New contribution
NewSocialContribution=New social contribution NewSocialContribution=New social contribution
ContributionsToPay=Contributions to pay ContributionsToPay=Contributions to pay
AccountancyTreasuryArea=Accountancy/Treasury area AccountancyTreasuryArea=Accountancy/Treasury area

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

@ -28,9 +28,12 @@ VATToCollect=TVA
VATSummary=Résumé TVA VATSummary=Résumé TVA
VATPayed=TVA payée VATPayed=TVA payée
VATCollected=TVA récupérée VATCollected=TVA récupérée
TaxAndDividendsArea=Espace taxes, charges sociales et dividendes
SocialContribution=Charge sociale SocialContribution=Charge sociale
SocialContributions=Charges sociales SocialContributions=Charges sociales
MenuNewSocialContribution=Nouvelle charge sociale MenuTaxAndDividends=Taxes et dividendes
MenuSocialContributions=Charges sociales
MenuNewSocialContribution=Nouvelle charge
NewSocialContribution=Nouvelle charge sociale NewSocialContribution=Nouvelle charge sociale
ContributionsToPay=Charges à payer ContributionsToPay=Charges à payer
AccountancyTreasuryArea=Espace Compta/Tréso AccountancyTreasuryArea=Espace Compta/Tréso