diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index a2f77e9c476..a44e9ed368a 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -29,8 +29,8 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require("../../tva.class.php"); -require("../../chargesociales.class.php"); +require_once(DOL_DOCUMENT_ROOT."/tva.class.php"); +require_once(DOL_DOCUMENT_ROOT."/chargesociales.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 5e9f57d342a..3029f7ce1d7 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * * 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 @@ -28,6 +28,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/tva.class.php"); $user->getrights('compta'); $user->getrights('tax'); @@ -42,89 +43,126 @@ if (! $year) { $year=date("Y", time()); } llxHeader(); -print_fiche_titre($langs->trans("Charges"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); +print_fiche_titre($langs->trans("TaxAndDividendsArea"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); print "
"; + + +/* +* Charges sociales +*/ +print_titre($langs->trans("SocialContributions")); print ''; print ""; -print ""; +print ""; print ""; -print ""; +print ""; print ""; print "\n"; -/* - * Charges sociales - */ -$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 .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; -$sql .= " WHERE s.fk_type = c.id"; +$sql = "SELECT c.libelle as lib, s.fk_type as type,"; +$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.= " WHERE s.fk_type = c.id"; if ($year > 0) { - $sql .= " AND ("; - // 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 .= " (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 .= ")"; + $sql .= " AND ("; + // 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 .= " (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 .= ")"; } -$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(); - $i = 0; - $var=true; - - while ($i < $num) { - $obj = $db->fetch_object(); - $var = !$var; - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; - $i++; - } -} else { - dolibarr_print_error($db); -} + $num = $db->num_rows($resql); + $i = 0; + $total = 0; + $totalpaye = 0; + $var=true; -/** - * Factures fournisseurs - */ -$sql = "SELECT count(f.rowid) as nb, sum(total_ttc) as total, sum(IF(paye=1,total_ttc,0)) as totalpaye"; -$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; + while ($i < $num) + { + $obj = $db->fetch_object($resql); + $var = !$var; + print ""; + print ''; + print ''; + print ''; + print ''; + print ''; + $total = $total + $obj->total; + $totalpaye = $totalpaye + $obj->totalpaye; + $i++; + } + print ''; + print '"; + print '"; + print ""; +} +else +{ + dolibarr_print_error($db); +} +print '
".$langs->trans("Group")."".$langs->trans("Type")."".$langs->trans("Nb")."".$langs->trans("AmountTTC")."".$langs->trans("Amount")."".$langs->trans("AlreadyPayed")."
'.$obj->lib.''.$obj->nb.''.price($obj->total).''.price($obj->totalpaye).'
'.$obj->lib.''.$obj->nb.''.price($obj->total).''.price($obj->totalpaye).'
'.$langs->trans("Total").''.price($total)."'.price($totalpaye)."
'; + +print "
"; + +$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) { - $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) ) { - - $langs->load("compta"); - - $num = $db->num_rows(); - $i = 0; - - while ($i < $num) { - $obj = $db->fetch_object(); - $var = !$var; - print ""; - print ''.$langs->trans("BillsForSuppliers").''; - print ''.$obj->nb.''; - print ''.price($obj->total).''; - print ''.price($obj->totalpaye).''; - print ''; - $i++; - } -} else { +$result = $db->query($sql); +if ($result) +{ + $num = $db->num_rows($result); + $i = 0; + $total = 0 ; + print ''; + print ''; + print ''; + print ""; + print '"; + print "\n"; + $var=1; + while ($i < $num) + { + $obj = $db->fetch_object($result); + $var=!$var; + print ""; + print '\n"; + print "\n"; + $total = $total + $obj->amount; + + print ""; + print "\n"; + + $i++; + } + print ''; + print '"; + + print "
'.$langs->trans("Date").'".$langs->trans("Label")."'.$langs->trans("Amount")."
'.dolibarr_print_date($obj->dm,'day')."".$obj->label."".price($obj->amount)."
'.$langs->trans("Total").''.price($total)."
"; + $db->free($result); +} +else +{ dolibarr_print_error($db); } -print "
"; - $db->close(); diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index bf47aa6ed90..668d314dbf3 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -27,7 +26,7 @@ */ require("./pre.inc.php"); -require("../../tva.class.php"); +require_once(DOL_DOCUMENT_ROOT."/tva.class.php"); $langs->load("compta"); $langs->load("compta"); @@ -52,10 +51,9 @@ if ($result) print '
'; print ''; print ''; - print ''; + print ''; print ""; print ""; - print "\n"; print "\n"; $var=1; while ($i < $num) @@ -63,17 +61,17 @@ if ($result) $obj = $db->fetch_object($result); $var=!$var; print ""; - print "\n"; + print '\n"; print "\n"; $total = $total + $obj->amount; - print ""; + print ""; print "\n"; $i++; } print ''; - print ""; + print ""; print "
'.$langs->trans("Date").''.$langs->trans("Date").'".$langs->trans("Label")."".$langs->trans("Amount")." 
".dolibarr_print_date($obj->dm)."'.dolibarr_print_date($obj->dm,'day')."".$obj->label."".price($obj->amount)." ".price($obj->amount)."
'.$langs->trans("Total").'".price($total)." 
".price($total)."
"; $db->free($result); diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 0bc98cbcfe2..f2013b4765c 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -453,22 +453,23 @@ class MenuLeft { if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("New"), 1, $user->rights->deplacement->lire); if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); } - // Charges sociales + + // Taxes et charges sociales if ($conf->tax->enabled) { - $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=charges&mainmenu=accountancy",$langs->trans("Charges"), 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 ($leftmenu=="charges") $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php",$langs->trans("List"), 1, $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&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); + $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy",$langs->trans("MenuTaxAndDividends"), 0, $user->rights->tax->charges->lire); + if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&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&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); + } } // Compta simple diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index e6771ed24f3..9c6754c223c 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -451,26 +451,23 @@ class MenuLeft { if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); } - // Charges sociales - /* + // Taxes et charges sociales if ($conf->tax->enabled) { - $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=charges&mainmenu=accountancy",$langs->trans("Charges"), 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); + $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy",$langs->trans("MenuTaxAndDividends"), 0, $user->rights->tax->charges->lire); + if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&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&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&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 /* diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 352f9b9fd3e..50cf33b8529 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -28,9 +28,12 @@ VATToCollect=VAT to collect VATSummary=VAT Summary VATPayed=VAT payed VATCollected=VAT collected +TaxAndDividendsArea=Tax, social contributions and dividends area SocialContribution=Social contribution SocialContributions=Social contributions -MenuNewSocialContribution=New social contribution +MenuTaxAndDividends=Taxes and dividends +MenuSocialContributions=Social contributions +MenuNewSocialContribution=New contribution NewSocialContribution=New social contribution ContributionsToPay=Contributions to pay AccountancyTreasuryArea=Accountancy/Treasury area diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 3417965dd96..1cfab11c2cf 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -28,9 +28,12 @@ VATToCollect=TVA VATSummary=Résumé TVA VATPayed=TVA payée VATCollected=TVA récupérée +TaxAndDividendsArea=Espace taxes, charges sociales et dividendes SocialContribution=Charge sociale SocialContributions=Charges sociales -MenuNewSocialContribution=Nouvelle charge sociale +MenuTaxAndDividends=Taxes et dividendes +MenuSocialContributions=Charges sociales +MenuNewSocialContribution=Nouvelle charge NewSocialContribution=Nouvelle charge sociale ContributionsToPay=Charges à payer AccountancyTreasuryArea=Espace Compta/Tréso