diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 1e888b09b55..12ef69907b3 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -64,6 +64,12 @@ jQuery(document).ready(function() {
 		hideoptions();
 		jQuery("#postgresql_options").show();
 	});
+	jQuery("#select_sql_compat").click(function() {
+		if (jQuery("#select_sql_compat").val() == 'POSTGRESQL')
+		{
+			jQuery("#checkbox_dump_disable-add-locks").attr('checked',true);
+		};
+	});
 });
 </script>
 <?php
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 6195ba4cd73..1d016e626b6 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -48,7 +48,7 @@ if ($page < 0) $page = 0;
 //$limit = $conf->liste_limit;
 //$offset = $limit * $page ;
 
-if (! $sortfield) $sortfield="s.date_ech";
+if (! $sortfield) $sortfield="cs.date_ech";
 if (! $sortorder) $sortorder="DESC";
 
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index b8a532399ea..fd09385c8fe 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -111,26 +111,26 @@ print $langs->trans("VATReportBuildWithOptionDefinedInModule").'<br>';
 print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>';
 print '<br>';
 
-echo '<table width="100%" class="nobordernopadding">';
-echo '<tr><td>';
+echo '<table width="100%" class="notopnoleftnoright">';
+echo '<tr><td class="notopnoleft" width="50%">';
 print_titre($langs->trans("VATSummary"));
 // The report mode is the one defined by defaut in tax module setup
 //print $modetax;
 //print '('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
-echo '</td><td width="5">&nbsp;</td><td>';
+echo '</td><td>';
 print_titre($langs->trans("VATPaid"));
 echo '</td></tr>';
 
-echo '<tr><td width="50%" valign="top">';
+echo '<tr><td class="notopnoleft" width="50%" valign="top">';
 
-print "<table class=\"noborder\" width=\"100%\">";
-print "<tr class=\"liste_titre\">";
-print "<td width=\"30%\">".$langs->trans("Year")." $y</td>";
-print "<td align=\"right\">".$langs->trans("VATToPay")."</td>";
-print "<td align=\"right\">".$langs->trans("VATToCollect")."</td>";
-print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
-print "<td>&nbsp;</td>\n";
-print "</tr>\n";
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td width="30%">'.$langs->trans("Year")." ".$y.'</td>';
+print '<td align="right">'.$langs->trans("VATToPay").'</td>';
+print '<td align="right">'.$langs->trans("VATToCollect").'</td>';
+print '<td align="right">'.$langs->trans("TotalToPay").'</td>';
+print '<td>&nbsp;</td>'."\n";
+print '</tr>'."\n";
 
 
 $y = $year_current ;
@@ -210,7 +210,8 @@ print '</tr>';
 print '</table>';
 
 
-echo '</td><td>&nbsp;</td><td valign="top" width="50%">';
+echo '</td>';
+print '<td class="notopnoleftnoright" valign="top" width="50%">';
 
 /*
  * Payed
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index cb2a27f075e..d7684b72b1f 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -393,7 +393,7 @@ Module400Name= Projets
 Module400Desc= Gestion des projets au sein des autres modules
 Module410Name= Webcalendar
 Module410Desc= Interface avec le calendrier Webcalendar
-Module500Name= Taxes et dividendes
+Module500Name= Taxes, charges et dividendes
 Module500Desc= Gestion des taxes, charges sociales et dividendes
 Module600Name= Notifications
 Module600Desc= Envoi de notifications (par mail) sur certains événements métiers Dolibarr, aux contacts de tiers
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index f273d330fb8..ed6336dc415 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -48,7 +48,7 @@ ToGetBack=A récupérer
 TaxAndDividendsArea=Espace taxes, charges sociales et dividendes
 SocialContribution=Charge sociale
 SocialContributions=Charges sociales
-MenuTaxAndDividends=Taxes et dividendes
+MenuTaxAndDividends=Taxes et charges
 MenuSocialContributions=Charges sociales
 MenuNewSocialContribution=Nouvelle charge
 NewSocialContribution=Nouvelle charge sociale