diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index 048a4308b36..10b8211a462 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -141,9 +141,7 @@ $linkback=''.$langs->trans("BackToM
print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup');
-/*
- * PDF
- */
+// Document templates
print '
';
print_titre($langs->trans("DonationsModels"));
@@ -176,7 +174,7 @@ print ''.$langs->trans("Name").' | ';
print ''.$langs->trans("Description").' | ';
print ''.$langs->trans("Activated").' | ';
print ''.$langs->trans("Default").' | ';
-print ''.$langs->trans("Infos").' | ';
+print ''.$langs->trans("Infos").' | ';
print "\n";
clearstatcache();
@@ -255,11 +253,9 @@ if (is_resource($handle))
$htmltooltip.='
'.$langs->trans("FeaturesSupported").':';
$htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
$htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+ $text=''.img_object($langs->trans("Preview"),'generic').'';
print '';
- print $html->textwithpicto('',$htmltooltip,1,0);
- print ' | ';
- print '';
- print ''.img_object($langs->trans("Preview"),'generic').'';
+ print $html->textwithpicto(' '.$text,$htmltooltip,-1,0);
print ' | ';
print "\n";
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 0cfeb8874f8..105328889bc 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -33,8 +33,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
$langs->load("admin");
$langs->load("errors");
-/*$langs->load("other");
-$langs->load("interventions");*/
+$langs->load("interventions");
if (!$user->admin)
accessforbidden();
@@ -42,6 +41,7 @@ accessforbidden();
$action = GETPOST("action");
$value = GETPOST("value");
+
/*
* Actions
*/
diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php
deleted file mode 100644
index 44054fc1f89..00000000000
--- a/htdocs/compta/tva.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- * Copyright (C) 2004 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/* \deprecated Ce fichier semble ne plus servir. A virer */
-
-require('../main.inc.php');
-
-
-/*
- *
- *
- */
-
-function pt ($db, $sql, $date) {
- global $bc;
-
- $result = $db->query($sql);
- if ($result) {
- $num = $db->num_rows($result);
- $i = 0; $total = 0 ;
- print "";
- print "";
- print "| $date | ";
- print "Montant | ";
- print " | \n";
- print "
\n";
- $var=True;
- while ($i < $num) {
- $obj = $db->fetch_object($result);
- $var=!$var;
- print "";
- print "| $obj->dm | \n";
- print "".price($obj->amount)." | | \n";
- print "
\n";
-
- $total = $total + $obj->amount;
-
- $i++;
- }
- print "| ".$langs->trans("TotalHT").": | ".price($total)." | ".$langs->trans("Currency".$conf->monnaie)." |
";
-
- print "
";
- $db->free();
- }
-}
-
-/*
- *
- */
-
-llxHeader();
-
-$yearc = strftime("%Y",time());
-
-
-echo '';
-
-print "TVA collect�e";
-
-for ($y = $yearc ; $y >= $conf->years ; $y=$y-1 ) {
-
- print "";
- print "| ";
-
- $sql = "SELECT sum(f.tva) as amount , date_format(f.datef,'%Y-%m') as dm";
- $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1 AND f.datef >= '$y-01-01' AND f.datef <= '$y-12-31' ";
- $sql .= " GROUP BY dm DESC";
-
- pt($db, $sql,"Ann�e $y");
-
- print " | ";
-}
-
-echo ' | ';
-echo 'Tva Pay�e
';
-echo ' |
';
-
-
-$db->close();
-
-llxFooter();
-?>
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index eff90336095..01b7887f2ec 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -16,6 +16,12 @@
* along with this program. If not, see .
*/
+/**
+ * \file htdocs/core/photos_resize.php
+ * \ingroup core
+ * \brief File of page to resize photos
+ */
+
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 060fb14090d..475d5430c0a 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -296,8 +296,15 @@ if ($_GET["id"] || $_GET["ref"])
dol_print_error($db);
}
print '| '.$langs->trans("LastMovement").' | ';
- if ($lastmovementdate) print dol_print_date($lastmovementdate,'dayhour').' ';
- print '('.$langs->trans("FullList").')';
+ if ($lastmovementdate)
+ {
+ print dol_print_date($lastmovementdate,'dayhour').' ';
+ print '('.$langs->trans("FullList").')';
+ }
+ else
+ {
+ print ''.$langs->trans("None").'';
+ }
print " |
";
print "";