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

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-02-10 10:20:19 +01:00
commit 928b95bcec
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/tools/dolibarr_export.php
View File

@ -64,6 +64,12 @@ jQuery(document).ready(function() {
hideoptions(); hideoptions();
jQuery("#postgresql_options").show(); 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> </script>
<?php <?php

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

@ -48,7 +48,7 @@ if ($page < 0) $page = 0;
//$limit = $conf->liste_limit; //$limit = $conf->liste_limit;
//$offset = $limit * $page ; //$offset = $limit * $page ;
if (! $sortfield) $sortfield="s.date_ech"; if (! $sortfield) $sortfield="cs.date_ech";
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";

29
htdocs/compta/tva/index.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * 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> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>';
print '<br>'; print '<br>';
echo '<table width="100%" class="nobordernopadding">'; echo '<table width="100%" class="notopnoleftnoright">';
echo '<tr><td>'; echo '<tr><td class="notopnoleft" width="50%">';
print_titre($langs->trans("VATSummary")); print_titre($langs->trans("VATSummary"));
// The report mode is the one defined by defaut in tax module setup // The report mode is the one defined by defaut in tax module setup
//print $modetax; //print $modetax;
//print '('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')'; //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")); print_titre($langs->trans("VATPaid"));
echo '</td></tr>'; 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 '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print '<tr class="liste_titre">';
print "<td width=\"30%\">".$langs->trans("Year")." $y</td>"; print '<td width="30%">'.$langs->trans("Year")." ".$y.'</td>';
print "<td align=\"right\">".$langs->trans("VATToPay")."</td>"; print '<td align="right">'.$langs->trans("VATToPay").'</td>';
print "<td align=\"right\">".$langs->trans("VATToCollect")."</td>"; print '<td align="right">'.$langs->trans("VATToCollect").'</td>';
print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>"; print '<td align="right">'.$langs->trans("TotalToPay").'</td>';
print "<td>&nbsp;</td>\n"; print '<td>&nbsp;</td>'."\n";
print "</tr>\n"; print '</tr>'."\n";
$y = $year_current ; $y = $year_current ;
@ -210,7 +210,8 @@ print '</tr>';
print '</table>'; print '</table>';
echo '</td><td>&nbsp;</td><td valign="top" width="50%">'; echo '</td>';
print '<td class="notopnoleftnoright" valign="top" width="50%">';
/* /*
* Payed * Payed

2
htdocs/langs/fr_FR/admin.lang
View File

@ -393,7 +393,7 @@ Module400Name= Projets
Module400Desc= Gestion des projets au sein des autres modules Module400Desc= Gestion des projets au sein des autres modules
Module410Name= Webcalendar Module410Name= Webcalendar
Module410Desc= Interface avec le calendrier Webcalendar Module410Desc= Interface avec le calendrier Webcalendar
Module500Name= Taxes et dividendes Module500Name= Taxes, charges et dividendes
Module500Desc= Gestion des taxes, charges sociales et dividendes Module500Desc= Gestion des taxes, charges sociales et dividendes
Module600Name= Notifications Module600Name= Notifications
Module600Desc= Envoi de notifications (par mail) sur certains événements métiers Dolibarr, aux contacts de tiers Module600Desc= Envoi de notifications (par mail) sur certains événements métiers Dolibarr, aux contacts de tiers

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

@ -48,7 +48,7 @@ ToGetBack=A récupérer
TaxAndDividendsArea=Espace taxes, charges sociales et dividendes TaxAndDividendsArea=Espace taxes, charges sociales et dividendes
SocialContribution=Charge sociale SocialContribution=Charge sociale
SocialContributions=Charges sociales SocialContributions=Charges sociales
MenuTaxAndDividends=Taxes et dividendes MenuTaxAndDividends=Taxes et charges
MenuSocialContributions=Charges sociales MenuSocialContributions=Charges sociales
MenuNewSocialContribution=Nouvelle charge MenuNewSocialContribution=Nouvelle charge
NewSocialContribution=Nouvelle charge sociale NewSocialContribution=Nouvelle charge sociale