diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 2c7ea8b7617..a208a0a308a 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/compta/charges/index.php
* \ingroup compta
- * \brief Page to list social contributions
+ * \brief Page to list payments of social contributions and vat
* \version $Id$
*/
@@ -39,7 +39,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
$year=$_GET["year"];
$filtre=$_GET["filtre"];
-if (! $year) { $year=date("Y", time()); }
+if (! $year && $_GET["mode"] != 'sconly') { $year=date("Y", time()); }
@@ -53,15 +53,23 @@ $payment_sc_static=new PaiementCharge($db);
llxHeader('',$langs->trans("TaxAndDividendsArea"));
-print_fiche_titre($langs->trans("TaxAndDividendsArea"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""));
+$title=$langs->trans("TaxAndDividendsArea");
+if ($_GET["mode"] == 'sconly') $title=$langs->trans("SocialContributionsPayments");
-print $langs->trans("DescTaxAndDividendsArea").'
';
-print "
";
+print_fiche_titre($title,($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""));
+
+if ($_GET["mode"] != 'sconly')
+{
+ print $langs->trans("DescTaxAndDividendsArea").'
';
+ print "
";
+}
// Social contributions
-
-print_titre($langs->trans("SocialContributions"));
+if ($_GET["mode"] != 'sconly')
+{
+ print_titre($langs->trans("SocialContributionsPayments"));
+}
print '
| '.$langs->trans("PeriodEndDate").' | '; @@ -90,7 +98,7 @@ if ($year > 0) $sql .= "or (s.periode is null and date_format(s.date_ech, '%Y') = $year)"; $sql .= ")"; } -$sql.= " GROUP BY c.id, c.libelle, s.rowid, s.fk_type, s.periode, s.date_ech"; +$sql.= " GROUP BY c.id, c.libelle, s.rowid, s.fk_type, s.periode, s.date_ech, pc.rowid, pc.datep, pc.amount"; $sql.= " ORDER BY c.libelle ASC"; dol_syslog("compta/charges/index.php: select payment sql=".$sql); diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 9b6c4f4aaf4..d002b26d34b 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur'; - print ''.img_file().' '.$obj->id.''; + $chargesociale_static->id=$obj->id; + $chargesociale_static->lib=$obj->id; + $chargesociale_static->ref=$obj->id; + print $chargesociale_static->getNomUrl(1,'20'); print ' | '; // Label @@ -193,7 +186,7 @@ if ($resql) print ''; if ($obj->periode) { - print 'periode).'">'.dol_print_date($obj->periode,'day').''; + print 'jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode),'day').''; } else { @@ -204,7 +197,7 @@ if ($resql) print ' | '.price($obj->amount).' | '; // Due date - print ''.dol_print_date($obj->de, 'day').' | '; + print ''.dol_print_date($db->jdate($obj->de), 'day').' | '; print ''.$chargesociale_static->LibStatut($obj->paye,5).' | '; diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 316be47c1c9..aa9f0f64964 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -178,11 +178,15 @@ if ($_GET["action"] == 'create') print '||||
| '.$langs->trans("PaymentMode").' | '; $html->select_types_paiements($_POST["paiementtype"], "paiementtype"); print " | \n"; + print "|||||||||
| '; - print ' |