diff --git a/htdocs/cashdesk/affPied.php b/htdocs/cashdesk/affPied.php
index c31b7f8a34bf815fc2840333fa99bca0a73103fe..96869faf21415a9b74eb0003f6ba751d28bdb1c2 100644
--- a/htdocs/cashdesk/affPied.php
+++ b/htdocs/cashdesk/affPied.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2007-2008 J�r�mie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
*
* 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
@@ -15,6 +15,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
+/**
+ * \file htdocs/cashdesk/affPied.php
+ * \ingroup cashdesk
+ * \brief Bottom of main page of point of sale module
+ * \version $Id$
+ */
+
?>
<div class="pied">
diff --git a/htdocs/includes/boxes/box_bookmarks.php b/htdocs/includes/boxes/box_bookmarks.php
index 58623b561b5febcfab82e4f406515de264f79891..0ebec730f27c3240a0d77cd001238093d58a1438 100644
--- a/htdocs/includes/boxes/box_bookmarks.php
+++ b/htdocs/includes/boxes/box_bookmarks.php
@@ -19,7 +19,7 @@
/**
* \file htdocs/includes/boxes/box_bookmarks.php
* \ingroup bookmark
- * \brief Module de g�n�ration de l'affichage de la box bookmark
+ * \brief Module to generate box of bookmarks list
* \version $Id$
*/
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_energie_graph.php b/htdocs/includes/boxes/box_energie_graph.php
deleted file mode 100644
index 1ea2105c69c54f47d756429d9008faaa235947b0..0000000000000000000000000000000000000000
--- a/htdocs/includes/boxes/box_energie_graph.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- */
-
-include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
-
-class box_energie_graph extends ModeleBoxes {
-
- var $boxcode="energie_graph";
- var $boximg="object_energie";
- var $boxlabel;
- var $depends = array("energie"); // Box active si module energie actif
-
- var $db;
- var $param;
-
- var $box_multiple = 1;
-
- var $info_box_head = array();
- var $info_box_contents = array();
-
- /**
- * \brief Constructeur de la classe
- */
- function box_energie_graph()
- {
- global $langs;
- $langs->load("boxes");
-
- $this->boxlabel=$langs->trans("EnergieGraph");
- }
-
- /**
- * \brief Charge les donn�es en m�moire pour affichage ult�rieur
- * \param $max Nombre maximum d'enregistrements � charger
- */
- function loadBox($max=5)
- {
- global $user, $langs, $db;
- $langs->load("boxes");
-
- $this->max=$max;
-
- $text = '<a href="energie/">'.$langs->trans("Energie").'</a>';
-
- $this->info_box_head = array('text' => $text,$max);
-
-
- $file = "small-all.1.png";
- $libelle = '<img border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=energie&file='.$file.'" alt="" title="">';
-
-
- $this->info_box_contents[0][0] = array('td' => 'align="left" width="16"',
- 'logo' => $this->boximg,
- 'url' => DOL_URL_ROOT."/energie/compteur.php?id=".$objp->rowid);
- $this->info_box_contents[0][1] = array('td' => 'align="left"',
- 'text' => $libelle,
- 'url' => DOL_URL_ROOT."/energie/compteur.php?id=".$objp->rowid);
-
-
- }
-
- function showBox()
- {
- parent::showBox($this->info_box_head, $this->info_box_contents);
- }
-}
-
-?>
diff --git a/htdocs/includes/boxes/box_energie_releve.php b/htdocs/includes/boxes/box_energie_releve.php
deleted file mode 100644
index 823b4ca36396a537c945848849311711dc51aea4..0000000000000000000000000000000000000000
--- a/htdocs/includes/boxes/box_energie_releve.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- */
-
-include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
-
-class box_energie_releve extends ModeleBoxes {
-
- var $boxcode="energie";
- var $boximg="object_energie";
- var $boxlabel;
- var $depends = array("energie");
-
- var $db;
- var $param;
-
- var $info_box_head = array();
- var $info_box_contents = array();
-
- /**
- * \brief Constructeur de la classe
- */
- function box_energie_releve()
- {
- global $langs;
- $langs->load("boxes");
-
- $this->boxlabel=$langs->trans("Energie");
- }
-
- /**
- * \brief Charge les donn�es en m�moire pour affichage ult�rieur
- * \param $max Nombre maximum d'enregistrements � charger
- */
- function loadBox($max=5)
- {
- global $user, $langs, $db;
- $langs->load("boxes");
-
- $this->max=$max;
-
- $text = '<a href="energie/">'.$langs->trans("Energie").'</a>';
-
- $this->info_box_head = array('text' => $text,$max);
-
-
- $sql = "SELECT ec.libelle, ecr.valeur, ec.rowid";
- $sql .= " FROM ".MAIN_DB_PREFIX."energie_compteur_releve as ecr,";
- $sql .= " ".MAIN_DB_PREFIX."energie_compteur as ec";
- $sql .= " WHERE ecr.fk_compteur = ec.rowid";
- $sql .= " ORDER BY ecr.date_releve DESC LIMIT 5";
- $resql = $db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i = 0;
- $var=True;
- while ($i < $num)
- {
- $objp = $db->fetch_object($resql);
-
- $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
- 'logo' => $this->boximg,
- 'url' => DOL_URL_ROOT."/energie/compteur.php?id=".$objp->rowid);
-
- $this->info_box_contents[$i][1] = array('td' => 'align="left"',
- 'text' => $objp->libelle,
- 'url' => DOL_URL_ROOT."/energie/compteur.php?id=".$objp->rowid);
-
- $this->info_box_contents[$i][2] = array('td' => 'align="right"',
- 'text' => $objp->valeur);
-
-
- $i++;
- }
- }
- }
-
- function showBox()
- {
- parent::showBox($this->info_box_head, $this->info_box_contents);
- }
-}
-
-?>
diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/includes/boxes/box_fournisseurs.php
index 6fbde9626d47e6f24a6de4ae424c9dc4a9138848..0ef9bc9126c0b08b0c0bc7457a62cbe9db06a5c1 100644
--- a/htdocs/includes/boxes/box_fournisseurs.php
+++ b/htdocs/includes/boxes/box_fournisseurs.php
@@ -20,7 +20,7 @@
/**
\file htdocs/includes/boxes/box_fournisseurs.php
\ingroup fournisseurs
- \brief Module de g�n�ration de l'affichage de la box fournisseurs
+ \brief Module to generate box of suppliers
\version $Id$
*/
@@ -52,8 +52,8 @@ class box_fournisseurs extends ModeleBoxes {
}
/**
- * \brief Charge les donn�es en m�moire pour affichage ult�rieur
- * \param $max Nombre maximum d'enregistrements � charger
+ * \brief Charge les donn�es en m�moire pour affichage ult�rieur
+ * \param $max Nombre maximum d'enregistrements � charger
*/
function loadBox($max=5)
{
diff --git a/htdocs/includes/boxes/box_osc_client.php b/htdocs/includes/boxes/box_osc_client.php
index 480a66a1a9664796311eab5462f7e9d1e2f7503e..e801f0a21b8e69ca3a6c0384d0ed03f3554642e0 100644
--- a/htdocs/includes/boxes/box_osc_client.php
+++ b/htdocs/includes/boxes/box_osc_client.php
@@ -20,7 +20,7 @@
/**
\file htdocs/includes/boxes/box_osc_client.php
\ingroup osc
- \brief Module de g�n�ration de l'affichage de la box osc client
+ \brief Module to generate box of shop customers
\version $Id$
*/
@@ -52,8 +52,8 @@ class box_osc_clients extends ModeleBoxes {
}
/**
- * \brief Charge les donn�es en m�moire pour affichage ult�rieur
- * \param $max Nombre maximum d'enregistrements � charger
+ * \brief Charge les donn�es en m�moire pour affichage ult�rieur
+ * \param $max Nombre maximum d'enregistrements � charger
*/
function loadBox($max=5)
{
diff --git a/htdocs/theme/auguria/graph-color.php b/htdocs/theme/auguria/graph-color.php
index f9b813f4ef6f20397524616e3951dc72aaf79de6..856f92e106f3e2159e73264b339202756c989260 100755
--- a/htdocs/theme/auguria/graph-color.php
+++ b/htdocs/theme/auguria/graph-color.php
@@ -1,6 +1,6 @@
<?PHP
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -18,11 +18,11 @@
*/
/**
- \file htdocs/theme/eldy/graph-color.php
- \brief Fichier de d�claration des couleurs pour les graphiques
- \ingroup core
- \version $Id$
-*/
+ * \file htdocs/theme/auguria/graph-color.php
+ * \brief File to declare colors to use to build graphics with theme Auguria
+ * \ingroup core
+ * \version $Id$
+ */
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235,235,224);
diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
index f9b813f4ef6f20397524616e3951dc72aaf79de6..01a40022b370e2f22d52ddced311f2f1cbb498c3 100755
--- a/htdocs/theme/eldy/graph-color.php
+++ b/htdocs/theme/eldy/graph-color.php
@@ -1,6 +1,6 @@
<?PHP
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -18,11 +18,11 @@
*/
/**
- \file htdocs/theme/eldy/graph-color.php
- \brief Fichier de d�claration des couleurs pour les graphiques
- \ingroup core
- \version $Id$
-*/
+ * \file htdocs/theme/eldy/graph-color.php
+ * \brief File to declare colors to use to build graphics with theme Eldy
+ * \ingroup core
+ * \version $Id$
+ */
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235,235,224);
diff --git a/htdocs/theme/freelug/graph-color.php b/htdocs/theme/freelug/graph-color.php
index 2c086656c0c3daec63fc5dd5f8031c64cae734ec..ba4eb1d75be4d75bd20d27480114e0c393d65234 100755
--- a/htdocs/theme/freelug/graph-color.php
+++ b/htdocs/theme/freelug/graph-color.php
@@ -18,11 +18,11 @@
*/
/**
- \file htdocs/theme/freelug/graph-color.php
- \brief Fichier de declaration des couleurs pour les graphiques
- \ingroup core
- \version $Id$
-*/
+ * \file htdocs/theme/freelug/graph-color.php
+ * \brief File to declare colors to use to build graphics with theme Freelug
+ * \ingroup core
+ * \version $Id$
+ */
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235,235,224);
diff --git a/htdocs/theme/yellow/graph-color.php b/htdocs/theme/yellow/graph-color.php
index a8d7b8e5b46b6d9bd80d2863c77d9b08cb3f8f35..e6e7483ccab6552c856b17949f357ee8121d0258 100755
--- a/htdocs/theme/yellow/graph-color.php
+++ b/htdocs/theme/yellow/graph-color.php
@@ -1,6 +1,6 @@
<?PHP
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -18,11 +18,11 @@
*/
/**
- \file htdocs/theme/yellow/graph-color.php
- \brief Fichier de d�claration des couleurs pour les graphiques
- \ingroup core
- \version $Id$
-*/
+ * \file htdocs/theme/yellow/graph-color.php
+ * \brief File to declare colors to use to build graphics with theme Yellow
+ * \ingroup core
+ * \version $Id$
+ */
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235,235,224);
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index fd1bad66219ada210b66330e439706c5d3b10481..59f447b8235be0206aa81fb348cd7971135ee6e5 100644
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -19,7 +19,7 @@
/**
* \file scripts/members/sync_members_dolibarr2ldap.php
- * \ingroup ldap adherent
+ * \ingroup ldap member
* \brief Script de mise a jour des adherents dans LDAP depuis base Dolibarr
* \version $Id$
*/
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 2dc0bccd85779caa166e359676cd98ebd2af23e2..ea4eb36a58c29ecdf475b82df84a2382c29fccd8 100644
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -19,7 +19,7 @@
/**
* \file scripts/members/sync_members_ldap2dolibarr.php
- * \ingroup ldap adherent
+ * \ingroup ldap member
* \brief Script de mise a jour des adherents dans Dolibarr depuis LDAP
* \version $Id$
*/