From 1ba947aef44beb9686eeebb34299ec262834751e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 19 Oct 2009 19:54:27 +0000
Subject: [PATCH] Qual: Uniformise doxygen headers
---
htdocs/admin/osc-languages.php | 15 +-
htdocs/admin/system/constall.php | 5 +-
htdocs/bookmarks/bookmark.class.php | 15 +-
htdocs/boutique/client/fiche.php | 3 +-
htdocs/boutique/client/pre.inc.php | 12 +-
htdocs/boutique/commande/fiche.php | 8 +-
htdocs/boutique/commande/pre.inc.php | 12 +-
htdocs/boutique/critiques/bestproduct.php | 4 +-
htdocs/boutique/critiques/pre.inc.php | 12 +-
htdocs/boutique/index.php | 8 +-
htdocs/boutique/notification/fiche.php | 5 +-
htdocs/boutique/notification/pre.inc.php | 12 +-
htdocs/boutique/pre.inc.php | 10 +-
htdocs/boutique/produits/pre.inc.php | 9 +-
htdocs/boutique/promotion/index.php | 7 +-
htdocs/boutique/promotion/pre.inc.php | 12 +-
htdocs/boutique/promotion/promotion.class.php | 2 -
htdocs/comm/adresse_livraison.class.php | 55 ++++---
htdocs/comm/bookmark.php | 20 +--
htdocs/comm/propal/pre.inc.php | 6 +-
htdocs/comm/propal/stats/pre.inc.php | 6 +-
htdocs/comm/prospect/pre.inc.php | 32 ++--
htdocs/commande/pre.inc.php | 6 +-
htdocs/commande/stats/pre.inc.php | 5 +-
htdocs/contrat/pre.inc.php | 5 +-
htdocs/docs/document.class.php | 15 +-
htdocs/docs/pre.inc.php | 6 +-
htdocs/domain/index.php | 13 +-
htdocs/domain/pre.inc.php | 7 +-
htdocs/expedition/pre.inc.php | 6 +-
.../stats/expeditionstats.class.php | 24 ++-
htdocs/expedition/stats/pre.inc.php | 9 +-
htdocs/fichinter/apercu.php | 5 +-
htdocs/fichinter/pre.inc.php | 2 -
htdocs/fichinter/rapport.php | 8 +-
htdocs/fourn/commande/pre.inc.php | 11 +-
htdocs/fourn/facture/pre.inc.php | 16 +-
htdocs/fourn/paiement/pre.inc.php | 19 +--
htdocs/fourn/product/fourn.php | 8 +-
htdocs/fourn/product/index.php | 8 +-
htdocs/fourn/product/pre.inc.php | 5 +-
htdocs/includes/boxes/box_energie_graph.php | 7 +-
htdocs/includes/boxes/box_energie_releve.php | 14 +-
htdocs/includes/menus/init_menu_auguria.sql | 1 -
.../societe/mod_codecompta_digitaria.php | 11 +-
.../societe/mod_codecompta_panicum.php | 15 +-
htdocs/lib/bookmark.lib.php | 5 +-
htdocs/lib/ldap.lib.php | 5 +-
htdocs/mantis/mantistop.php | 8 +-
htdocs/oscommerce_ws/produits/index.php | 7 +-
htdocs/phenix/phenixtop.php | 5 +-
htdocs/product/droitpret/droitpret.class.php | 89 ++++++-----
.../product/droitpret/modules_droitpret.php | 23 ++-
htdocs/product/droitpret/pre.inc.php | 17 +-
htdocs/product/stats/index.php | 6 +-
htdocs/product/stats/pre.inc.php | 5 +-
htdocs/product/traduction.php | 5 +-
htdocs/rapport/AtomeFactureValidee.class.php | 12 +-
htdocs/rapport/AtomePropaleValidee.class.php | 12 +-
htdocs/rapport/index.php | 19 ++-
htdocs/rapport/pre.inc.php | 2 -
htdocs/societe/checkvat/checkVatPopup.php | 25 ++-
htdocs/societe/notify/index.php | 23 ++-
htdocs/societe/notify/pre.inc.php | 5 +-
htdocs/societe/pre.inc.php | 5 +-
htdocs/theme/auguria/graph-color.php | 11 +-
htdocs/theme/freelug/graph-color.php | 11 +-
htdocs/user/group/pre.inc.php | 25 ++-
htdocs/webcal/webcaltop.php | 9 +-
scripts/company/export-csv-example.php | 12 +-
scripts/energie/graph-line.php | 54 ++++---
scripts/energie/graph.php | 145 +++++++++---------
scripts/withdrawals/prelevement-verif.php | 28 ++--
scripts/withdrawals/prelevement.php | 24 ++-
74 files changed, 456 insertions(+), 637 deletions(-)
diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php
index a66b331fbef..83b97be7c4d 100644
--- a/htdocs/admin/osc-languages.php
+++ b/htdocs/admin/osc-languages.php
@@ -14,17 +14,14 @@
* 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$
- * $Source$
- *
*/
-/*! \file htdocs/admin/osc-languages.php
- \ingroup boutique
- \brief Page d'administration/configuration du module Boutique
- \version $Revision$
-*/
+/**
+ * \file htdocs/admin/osc-languages.php
+ * \ingroup boutique
+ * \brief Page d'administration/configuration du module Boutique
+ * \version $Id$
+ */
require("./pre.inc.php");
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 68ae507cb56..454629a93b2 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -16,15 +16,12 @@
* 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$
- * $Source$
*/
/**
* \file htdocs/admin/system/constall.php
* \brief Page d'info de toutes les constantes
- * \version $Revision$
+ * \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/bookmarks/bookmark.class.php b/htdocs/bookmarks/bookmark.class.php
index 8baec97e4c5..9e121478592 100644
--- a/htdocs/bookmarks/bookmark.class.php
+++ b/htdocs/bookmarks/bookmark.class.php
@@ -14,16 +14,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/bookmarks/bookmark.class.php
\ingroup bookmark
\brief Fichier de la classe des bookmark
- \version $Revision$
+ \version $Id$
*/
@@ -47,7 +44,7 @@ class Bookmark
/**
* \brief Constructeur
- * \param db Handler d'acc�s base de donn�es
+ * \param db Handler d'acc�s base de donn�es
* \param id Id du bookmark
*/
function Bookmark($db, $id=-1)
@@ -58,7 +55,7 @@ class Bookmark
/**
* \brief Charge le bookmark
- * \param id Id du bookmark � charger
+ * \param id Id du bookmark � charger
*/
function fetch($id)
{
@@ -95,7 +92,7 @@ class Bookmark
/**
* \brief Insere bookmark en base
- * \return int <0 si ko, rowid du bookmark cr�� si ok
+ * \return int <0 si ko, rowid du bookmark cr�� si ok
*/
function create()
{
@@ -145,7 +142,7 @@ class Bookmark
}
/**
- * \brief Mise � jour du bookmark
+ * \brief Mise � jour du bookmark
* \return int <0 si ko, >0 si ok
*/
function update()
@@ -177,7 +174,7 @@ class Bookmark
/**
* \brief Supprime le bookmark
- * \param id Id bookmark � supprimer
+ * \param id Id bookmark � supprimer
* \return int <0 si ko, >0 si ok
*/
function remove($id)
diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php
index a8f7e1e4a33..3a9ef723531 100644
--- a/htdocs/boutique/client/fiche.php
+++ b/htdocs/boutique/client/fiche.php
@@ -63,8 +63,9 @@ if ($_GET['id'])
*/
$sql = "SELECT o.orders_id, o.customers_id,".$dbosc->pdate("date_purchased")." as date_purchased, t.value as total";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
- $sql .= " WHERE o.customers_id = " . $client->id;
+ $sql .= " WHERE o.customers_id = " . $_GET['id'];
$sql .= " AND o.orders_id = t.orders_id AND t.class = 'ot_total'";
+ //echo $sql;
if ( $dbosc->query($sql) )
{
$num = $dbosc->num_rows();
diff --git a/htdocs/boutique/client/pre.inc.php b/htdocs/boutique/client/pre.inc.php
index e4e466dffcf..885b4617a65 100644
--- a/htdocs/boutique/client/pre.inc.php
+++ b/htdocs/boutique/client/pre.inc.php
@@ -15,15 +15,12 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/client/pre.inc.php
\brief Fichier gestionnaire du menu de gauche de l'espace boutique client
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -35,19 +32,20 @@ function llxHeader($head = "", $urlp = "")
{
global $user,$conf, $langs;
$langs->load("shop");
-
+ $langs->load("products");
+
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Products"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2);
$menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Orders"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes"));
left_menu($menu->liste);
}
diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php
index 09459802dfa..b16102db243 100644
--- a/htdocs/boutique/commande/fiche.php
+++ b/htdocs/boutique/commande/fiche.php
@@ -39,7 +39,6 @@ if ($_GET['id'])
{
$commande = new Commande($db);
$result = $commande->fetch($_GET['id']);
-
if ( $result )
{
@@ -67,8 +66,9 @@ if ($_GET['id'])
*/
$sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_products";
- $sql .= " WHERE orders_id = " . $commande->id;
-
+ $sql .= " WHERE orders_id = " . $_GET['id'];
+//$commande->id;
+// echo $sql;
if ( $dbosc->query($sql) )
{
$num = $dbosc->num_rows();
@@ -112,7 +112,7 @@ if ($_GET['id'])
print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
print "<tr>";
- print '<td width="20%">Frais d\'exp�ditions</td><td width="80%">'.price($commande->total_ot_shipping).' EUR</td></tr>';
+ print '<td width="20%">Frais d\'expeditions</td><td width="80%">'.price($commande->total_ot_shipping).' EUR</td></tr>';
print '<td width="20%">'.$langs->trans("Lastname").'</td><td width="80%">'.price($commande->total_ot_total).' EUR</td></tr>';
print "</table>";
diff --git a/htdocs/boutique/commande/pre.inc.php b/htdocs/boutique/commande/pre.inc.php
index ea5e73f0dcf..17e2e7c518d 100644
--- a/htdocs/boutique/commande/pre.inc.php
+++ b/htdocs/boutique/commande/pre.inc.php
@@ -15,19 +15,16 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/commande/pre.inc.php
\brief Fichier gestionnaire du menu de gauche
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
+require_once(DOL_DOCUMENT_ROOT."/boutique/commande/commande.class.php");
require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php');
@@ -35,7 +32,8 @@ function llxHeader($head = "", $urlp = "")
{
global $user,$conf, $langs;
$langs->load("shop");
-
+ $langs->load("products");
+
top_menu($head);
$menu = new Menu();
@@ -47,7 +45,7 @@ function llxHeader($head = "", $urlp = "")
$menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Orders"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes"));
left_menu($menu->liste);
}
diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php
index 52e7852c8f7..eca4c90c955 100644
--- a/htdocs/boutique/critiques/bestproduct.php
+++ b/htdocs/boutique/critiques/bestproduct.php
@@ -45,7 +45,7 @@ $limit = $conf->liste_limit;
$offset = $limit * $page ;
-print_barre_liste("Liste des produits class�s pas critiques", $page, "bestproduct.php");
+print_barre_liste("Liste des produits classes par critiques", $page, "bestproduct.php");
$sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_id, p.products_model, p.products_quantity, p.products_status";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p ";
@@ -58,7 +58,7 @@ $sql .= $dbosc->plimit( $limit ,$offset);
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<TR class=\"liste_titre\"><td>".$langs->trans("Ref");
print '</td><TD align="center">Indice critiques</TD>';
-print '</td><td align="center">Quantit�';
+print '</td><td align="center">Quantite';
print '</td><td align="center">Status</TD>';
print "</TR>\n";
diff --git a/htdocs/boutique/critiques/pre.inc.php b/htdocs/boutique/critiques/pre.inc.php
index 71ecf6db628..85534a7ebf6 100644
--- a/htdocs/boutique/critiques/pre.inc.php
+++ b/htdocs/boutique/critiques/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/critiques/pre.inc.php
\ingroup boutique
\brief Fichier gestionnaire du menu gauche des critiques OSCommerce
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -36,19 +33,20 @@ function llxHeader($head = "", $urlp = "")
{
global $user,$conf, $langs;
$langs->load("shop");
-
+ $langs->load("products");
+
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Products"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2);
$menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Orders"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes"));
left_menu($menu->liste);
}
diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php
index 7081e5cda0c..af3907d4406 100644
--- a/htdocs/boutique/index.php
+++ b/htdocs/boutique/index.php
@@ -15,21 +15,19 @@
* 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$
*/
/**
\file htdocs/boutique/index.php
\ingroup boutique
\brief Page accueil zone boutique
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
$langs->load("boutique");
-
+$langs->load("orders");
llxHeader("",$langs->trans("OSCommerceShop"),"");
@@ -140,7 +138,7 @@ if ( $dbosc->query($sql) )
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
- print '<td colspan="4">'.$langs->trans("Derni�res commandes").'</td></tr>';
+ print '<td colspan="4">'.$langs->trans("LastOrders").'</td></tr>';
$num = min($num,OSC_MAXNBCOM);
while ($i < $num)
diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php
index 7bb56a73b73..bf37b5e5684 100644
--- a/htdocs/boutique/notification/fiche.php
+++ b/htdocs/boutique/notification/fiche.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/notification/fiche.php
\ingroup boutique
\brief Page fiche notification OS Commerce
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/boutique/notification/pre.inc.php b/htdocs/boutique/notification/pre.inc.php
index 7091c36d034..96c9369caa2 100644
--- a/htdocs/boutique/notification/pre.inc.php
+++ b/htdocs/boutique/notification/pre.inc.php
@@ -16,9 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
+/**
+ \file htdocs/boutique/notification/pre.inc.php
+ \brief Fichier gestionnaire du menu de gauche
+ \version $Id$
+*/
+
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/boutique/notification/notification.class.php');
@@ -28,19 +33,20 @@ function llxHeader($head = "", $urlp = "")
{
global $user,$conf, $langs;
$langs->load("shop");
+ $langs->load("products");
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Products"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2);
$menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Orders"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes"));
left_menu($menu->liste);
}
diff --git a/htdocs/boutique/pre.inc.php b/htdocs/boutique/pre.inc.php
index cdaea7a77fd..0e387e58f65 100644
--- a/htdocs/boutique/pre.inc.php
+++ b/htdocs/boutique/pre.inc.php
@@ -15,15 +15,12 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/pre.inc.php
\brief Fichier gestionnaire du menu de gauche
- \version $Revision$
+ \version $Id$
*/
require("../main.inc.php");
@@ -36,19 +33,20 @@ function llxHeader($head = "", $urlp = "")
{
global $user,$conf, $langs;
$langs->load("shop");
+ $langs->load("products");
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Products"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2);
$menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Orders"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes"));
left_menu($menu->liste);
}
diff --git a/htdocs/boutique/produits/pre.inc.php b/htdocs/boutique/produits/pre.inc.php
index 7386651acc9..9df8960c23d 100644
--- a/htdocs/boutique/produits/pre.inc.php
+++ b/htdocs/boutique/produits/pre.inc.php
@@ -15,15 +15,12 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/produits/pre.inc.php
\brief Fichier gestionnaire du menu de gauche
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -40,13 +37,13 @@ function llxHeader($head = "", $urlp = "")
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Products"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2);
$menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Orders"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes"));
left_menu($menu->liste);
}
diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php
index c5b5264cb39..b1052cb7718 100644
--- a/htdocs/boutique/promotion/index.php
+++ b/htdocs/boutique/promotion/index.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/promotions/index.php
\ingroup boutique
\brief Page gestion promotions OSCommerce
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
@@ -77,7 +74,7 @@ if ($resql)
print_liste_field_titre("Titre","index.php", "pd.products_name");
print "<td> </td><td> </td><td>Fin</td>";
print '<td align="right">Prix initial</td>';
- print '<td align="right">Prix remis�</td>';
+ print '<td align="right">Prix remise</td>';
print "</tr>\n";
$var=True;
while ($i < $num)
diff --git a/htdocs/boutique/promotion/pre.inc.php b/htdocs/boutique/promotion/pre.inc.php
index 91902cfce6d..71c63e46707 100644
--- a/htdocs/boutique/promotion/pre.inc.php
+++ b/htdocs/boutique/promotion/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/boutique/promotion/pre.inc.php
\ingroup boutique
\brief Fichier gestionnaire du menu gauche des promotions OSCommerce
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -36,19 +33,20 @@ function llxHeader($head = "", $urlp = "")
{
global $user,$conf, $langs;
$langs->load("shop");
-
+ $langs->load("products");
+
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Products"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2);
$menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications"));
$menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Orders"));
+ $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes"));
left_menu($menu->liste);
}
diff --git a/htdocs/boutique/promotion/promotion.class.php b/htdocs/boutique/promotion/promotion.class.php
index a522a5b2cf5..474547705a1 100644
--- a/htdocs/boutique/promotion/promotion.class.php
+++ b/htdocs/boutique/promotion/promotion.class.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
class Promotion {
diff --git a/htdocs/comm/adresse_livraison.class.php b/htdocs/comm/adresse_livraison.class.php
index ada16756b44..e42f639f913 100644
--- a/htdocs/comm/adresse_livraison.class.php
+++ b/htdocs/comm/adresse_livraison.class.php
@@ -16,16 +16,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/comm/adresse_livraison.class.php
\ingroup societe, expedition
\brief Fichier de la classe des adresses de livraison
- \version $Revision$
+ \version $Id$
*/
@@ -37,7 +34,7 @@
class AdresseLivraison
{
var $db;
-
+
var $id;
var $label;
var $socid;
@@ -60,7 +57,7 @@ class AdresseLivraison
function AdresseLivraison($DB, $id=0)
{
global $conf;
-
+
$this->db = $DB;
$this->id = $id;
@@ -85,7 +82,7 @@ class AdresseLivraison
dol_syslog("societe.class.php::create delivery adress ".$this->label);
$this->db->begin();
-
+
$result = $this->verify();
if ($result >= 0)
@@ -170,7 +167,7 @@ class AdresseLivraison
dol_syslog("Societe::Update");
// Nettoyage des parametres
-
+
$this->fk_societe = $socid;
$this->label = trim($this->label);
$this->nom = trim($this->nom);
@@ -191,33 +188,33 @@ class AdresseLivraison
if ($result >= 0)
{
dol_syslog("Societe::Update delivery adress verify ok");
-
+
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_adresse_livraison";
$sql.= " SET label = '" . addslashes($this->label) ."'"; // Champ obligatoire
$sql.= ",nom = '" . addslashes($this->nom) ."'"; // Champ obligatoire
$sql.= ",address = '" . addslashes($this->adresse) ."'";
-
+
if ($this->cp)
{ $sql .= ",cp = '" . $this->cp ."'"; }
-
+
if ($this->ville)
{ $sql .= ",ville = '" . addslashes($this->ville) ."'"; }
$sql .= ",fk_pays = '" . ($this->pays_id?$this->pays_id:'0') ."'";
$sql.= ",note = '" . addslashes($this->note) ."'";
-
+
if ($this->tel)
{ $sql .= ",tel = '" . $this->tel ."'"; }
-
+
if ($this->fax)
{ $sql .= ",fax = '" . $this->fax ."'"; }
if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
$sql .= " WHERE fk_societe = '" . $socid ."' AND rowid = '" . $id ."'";
-
+
$resql=$this->db->query($sql);
if ($resql)
- {
+ {
$result = 1;
}
else
@@ -230,7 +227,7 @@ class AdresseLivraison
}
else
{
-
+
$this->error = $langs->trans("Error sql=$sql");
dol_syslog("Societe::Update delivery adress echec sql=$sql");
$result = -2;
@@ -255,25 +252,25 @@ class AdresseLivraison
$sql = 'SELECT rowid, nom, client, fournisseur';
$sql .= ' FROM '.MAIN_DB_PREFIX.'societe';
$sql .= ' WHERE rowid = '.$socid;
-
+
$resqlsoc=$this->db->query($sql);
-
+
if ($resqlsoc)
{
if ($this->db->num_rows($resqlsoc))
{
$obj = $this->db->fetch_object($resqlsoc);
-
+
$this->nom_societe = $obj->nom;
$this->socid = $obj->rowid;
$this->id = $obj->rowid;
$this->client = $obj->client;
$this->fournisseur = $obj->fournisseur;
}
-
+
$this->lignes = array();
$this->db->free($resqlsoc);
-
+
// Adresses de livraison liees a la societe
if ($this->socid)
{
@@ -284,7 +281,7 @@ class AdresseLivraison
$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_adresse_livraison as a';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
$sql .= ' WHERE a.fk_societe = '.$this->socid;
-
+
$resql=$this->db->query($sql);
if ($resql)
{
@@ -293,7 +290,7 @@ class AdresseLivraison
while ($i < $num)
{
$objp = $this->db->fetch_object($resql);
-
+
$ligne = new AdresseLivraisonLigne();
$ligne->id = $objp->id;
@@ -311,7 +308,7 @@ class AdresseLivraison
$ligne->tel = $objp->tel;
$ligne->fax = $objp->fax;
$ligne->note = $objp->note;
-
+
$this->lignes[$i] = $ligne;
$i++;
}
@@ -336,7 +333,7 @@ class AdresseLivraison
$this->error=$this->db->error();
}
}
-
+
/**
* \brief Charge depuis la base l'objet adresse de livraison
* \param id Id de l'adresse de livraison a charger en memoire
@@ -404,7 +401,7 @@ class AdresseLivraison
return $result;
}
-
+
/**
* \brief Suppression d'une adresse de livraison
@@ -419,7 +416,7 @@ class AdresseLivraison
$result = $this->db->query($sql);
- if (!$result)
+ if (!$result)
{
print $this->db->error() . '<br>' . $sql;
}
@@ -473,9 +470,9 @@ class AdresseLivraison
}
-class AdresseLivraisonLigne
+class AdresseLivraisonLigne
{
-
+
var $id;
var $date_creation;
var $date_update;
diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php
index 7596a6b74de..63ce58902c7 100644
--- a/htdocs/comm/bookmark.php
+++ b/htdocs/comm/bookmark.php
@@ -14,19 +14,15 @@
* 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$
- * $Source$
- *
*/
-
+
/**
\file htdocs/comm/bookmark.php
\brief Page affichage des bookmarks
- \version $Revision$
+ \version $Id$
*/
-
+
require("./pre.inc.php");
@@ -47,7 +43,7 @@ $pagenext = $page + 1;
/*
* Actions
*/
-
+
if ($_GET["action"] == 'add')
{
$bookmark=new Bookmark($db);
@@ -56,7 +52,7 @@ if ($_GET["action"] == 'add')
$bookmark->target=$user->id;
$bookmark->title='xxx';
$bookmark->favicon='xxx';
-
+
$res=$bookmark->create();
if ($res > 0)
{
@@ -76,7 +72,7 @@ if ($_GET["action"] == 'delete')
$bookmark->target=$user->id;
$bookmark->title='xxx';
$bookmark->favicon='xxx';
-
+
$res=$bookmark->remove();
if ($res > 0)
{
@@ -91,7 +87,7 @@ if ($_GET["action"] == 'delete')
print_fiche_titre($langs->trans("Bookmarks"));
-
+
$sql = "SELECT s.rowid, s.nom, ".$db->pdate("b.dateb")." as dateb, b.rowid as bid, b.fk_user, b.url, b.target, u.name, u.firstname";
$sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE b.fk_soc = s.rowid AND b.fk_user=u.rowid";
@@ -124,7 +120,7 @@ if ($resql)
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
+
$var=!$var;
print "<tr $bc[$var]>";
//print "<td>" . ($i + 1 + ($limit * $page)) . "</td>";
diff --git a/htdocs/comm/propal/pre.inc.php b/htdocs/comm/propal/pre.inc.php
index a8ce30107c2..7aa15fb1331 100644
--- a/htdocs/comm/propal/pre.inc.php
+++ b/htdocs/comm/propal/pre.inc.php
@@ -15,17 +15,13 @@
* 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$
- * $Source$
- *
*/
/**
\file htdocs/comm/propal/pre.inc.php
\ingroup propale
\brief Fichier de gestion du menu gauche du module propale
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
diff --git a/htdocs/comm/propal/stats/pre.inc.php b/htdocs/comm/propal/stats/pre.inc.php
index 7d73113d906..e52dd99194b 100644
--- a/htdocs/comm/propal/stats/pre.inc.php
+++ b/htdocs/comm/propal/stats/pre.inc.php
@@ -15,17 +15,13 @@
* 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$
- * $Source$
- *
*/
/**
\file htdocs/comm/propal/stats/pre.inc.php
\ingroup propale
\brief Fichier de gestion du menu gauche du module propale stats
- \version $Revision$
+ \version $Id$
*/
require("../../../main.inc.php");
diff --git a/htdocs/comm/prospect/pre.inc.php b/htdocs/comm/prospect/pre.inc.php
index c4c0588009e..499f8317b22 100644
--- a/htdocs/comm/prospect/pre.inc.php
+++ b/htdocs/comm/prospect/pre.inc.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005 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
@@ -15,17 +15,13 @@
* 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$
- * $Source$
- *
*/
/**
\file htdocs/comm/prospect/pre.inc.php
\ingroup commercial
\brief Fichier de gestion du menu gauche de l'espace commercial
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -33,37 +29,37 @@ require("../../main.inc.php");
function llxHeader($head = "", $urlp = "")
{
global $user, $conf, $langs;
-
+
$langs->load("companies");
$langs->load("commercial");
-
+
top_menu($head);
-
+
$menu = new Menu();
-
+
$menu->add(DOL_URL_ROOT."/comm/prospect/", $langs->trans("Prospection"));
-
+
$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=p", $langs->trans("MenuNewProspect"));
-
+
$menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("List"));
-
+
$menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=0", $langs->trans("LastProspectNeverContacted"));
$menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=1", $langs->trans("LastProspectToContact"));
$menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=2", $langs->trans("LastProspectContactInProcess"));
$menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=3", $langs->trans("LastProspectContactDone"));
-
+
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", $langs->trans("Contacts"));
-
+
$menu->add(DOL_URL_ROOT."/comm/action/index.php", $langs->trans("Actions"));
-
+
if ($conf->propal->enabled && $user->rights->propale->lire)
{
$langs->load("propal");
$menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop"));
}
-
+
$menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
-
+
left_menu($menu->liste);
}
?>
diff --git a/htdocs/commande/pre.inc.php b/htdocs/commande/pre.inc.php
index e662accb9d3..7e7dae2bf41 100644
--- a/htdocs/commande/pre.inc.php
+++ b/htdocs/commande/pre.inc.php
@@ -15,17 +15,13 @@
* 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$
- * $Source$
- *
*/
/**
\file htdocs/commande/pre.inc.php
\ingroup commandes
\brief Gestionnaire du menu commandes
- \version $Revision$
+ \version $Id$
*/
require("../main.inc.php");
diff --git a/htdocs/commande/stats/pre.inc.php b/htdocs/commande/stats/pre.inc.php
index d7bbf326cf3..2c6ec58e984 100644
--- a/htdocs/commande/stats/pre.inc.php
+++ b/htdocs/commande/stats/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/commande/stats/pre.inc.php
\ingroup commandes
\brief Gestionnaire du menu commandes
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
diff --git a/htdocs/contrat/pre.inc.php b/htdocs/contrat/pre.inc.php
index b2a2db59a79..6f0edff61aa 100644
--- a/htdocs/contrat/pre.inc.php
+++ b/htdocs/contrat/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/contrat/pre.inc.php
\ingroup contrat
\brief Fichier de gestion du menu gauche de l'espace contrat
- \version $Revision$
+ \version $Id$
*/
require("../main.inc.php");
diff --git a/htdocs/docs/document.class.php b/htdocs/docs/document.class.php
index e620495460b..92e3e73369d 100644
--- a/htdocs/docs/document.class.php
+++ b/htdocs/docs/document.class.php
@@ -14,16 +14,13 @@
* 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$
- * $Source$
- *
*/
/**
- \file htdocs/docs/document.class.php
- \ingroup editeurs
- \brief Classe de generation des courriers pour les editeurs
+ * \file htdocs/docs/document.class.php
+ * \ingroup editeurs
+ * \brief Classe de generation des courriers pour les editeurs
+ * \version $Id$
*/
@@ -31,7 +28,7 @@ class Document
{
/**
\brief Constructeur
- \param db Handler acc�s base de donn�e
+ \param db Handler acc�s base de donn�e
*/
function Document ($db)
{
@@ -41,7 +38,7 @@ class Document
/**
- \brief G�n�re le document
+ \brief G�n�re le document
\return int 0= ok, <> 0 = ko
*/
function Generate ($id)
diff --git a/htdocs/docs/pre.inc.php b/htdocs/docs/pre.inc.php
index efb2469e5b2..0b605fbe556 100644
--- a/htdocs/docs/pre.inc.php
+++ b/htdocs/docs/pre.inc.php
@@ -14,17 +14,13 @@
* 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$
*/
/**
* \file htdocs/docs/pre.inc.php
* \brief Fichier gestionnaire du menu de gauche de l'accueil
- * \version $Source$
+ * \version $Id$
*/
-require ("../main.inc.php");
-
require_once("../main.inc.php");
diff --git a/htdocs/domain/index.php b/htdocs/domain/index.php
index 008509fb95a..e19ef7a0372 100644
--- a/htdocs/domain/index.php
+++ b/htdocs/domain/index.php
@@ -2,9 +2,6 @@
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
*
- * $Id$
- * $Source$
- *
* 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
@@ -18,6 +15,8 @@
* 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$
*/
require("./pre.inc.php");
@@ -26,7 +25,7 @@ require("./pre.inc.php");
/*
* Affichage
*/
-
+
llxHeader();
@@ -47,11 +46,11 @@ if ($result)
print "<tr class=\"liste_titre\">";
print '<td>Date</td><td>'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>';
- print "<td align=\"right\">R�duction</td>";
+ print "<td align=\"right\">R�duction</td>";
print "</tr>\n";
-
- $var=True;
+
+ $var=True;
$num = $db->num_rows();
$i = 0; $total = 0;
diff --git a/htdocs/domain/pre.inc.php b/htdocs/domain/pre.inc.php
index f1cd8be467a..fc4c1c302a3 100644
--- a/htdocs/domain/pre.inc.php
+++ b/htdocs/domain/pre.inc.php
@@ -1,8 +1,5 @@
<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * $Id$
- * $Source$
+/* Copyright (C) 2001-2002 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
@@ -17,6 +14,8 @@
* 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$
*/
require_once("../main.inc.php");
diff --git a/htdocs/expedition/pre.inc.php b/htdocs/expedition/pre.inc.php
index 9b309a638c0..4a15f239b30 100644
--- a/htdocs/expedition/pre.inc.php
+++ b/htdocs/expedition/pre.inc.php
@@ -15,17 +15,13 @@
* 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$
- * $Source$
- *
*/
/**
\file htdocs/expedition/pre.inc.php
\ingroup expedition
\brief Fichier de gestion du menu gauche du module expedition
- \version $Revision$
+ \version $Id$
*/
require("../main.inc.php");
diff --git a/htdocs/expedition/stats/expeditionstats.class.php b/htdocs/expedition/stats/expeditionstats.class.php
index 1c18050c340..8e3de6754be 100644
--- a/htdocs/expedition/stats/expeditionstats.class.php
+++ b/htdocs/expedition/stats/expeditionstats.class.php
@@ -17,11 +17,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
-class ExpeditionStats
+class ExpeditionStats
{
var $db;
@@ -30,13 +28,13 @@ class ExpeditionStats
$this->db = $DB;
}
/**
- * Renvoie le nombre de expedition par ann�e
+ * Renvoie le nombre de expedition par ann�e
*
*/
function getNbExpeditionByYear()
{
global $conf;
-
+
$result = array();
$sql = "SELECT count(*), date_format(e.date_expedition,'%Y') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
@@ -45,7 +43,7 @@ class ExpeditionStats
$sql.= " AND e.fk_soc = s.rowid";
$sql.= " s.entity = ".$conf->entity;
$sql.= " GROUP BY dm DESC";
-
+
if ($this->db->query($sql))
{
$num = $this->db->num_rows();
@@ -54,7 +52,7 @@ class ExpeditionStats
{
$row = $this->db->fetch_row($i);
$result[$i] = $row;
-
+
$i++;
}
$this->db->free();
@@ -62,13 +60,13 @@ class ExpeditionStats
return $result;
}
/**
- * Renvoie le nombre de expedition par mois pour une ann�e donn�e
+ * Renvoie le nombre de expedition par mois pour une ann�e donn�e
*
*/
function getNbExpeditionByMonth($year)
{
global $conf;
-
+
$result = array();
$sql = "SELECT count(*), date_format(e.date_expedition,'%m') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
@@ -96,14 +94,14 @@ class ExpeditionStats
{
$res[$i] = $result[$i] + 0;
}
-
+
$data = array();
-
+
for ($i = 1 ; $i < 13 ; $i++)
{
$data[$i-1] = array(dol_print_date(dol_mktime(12,0,0,$i,1,$year),"%b"), $res[$i]);
}
-
+
return $data;
}
@@ -117,7 +115,7 @@ class ExpeditionStats
for ($i = 1 ; $i < 13 ; $i++)
{
- $data[$i-1] = array(dol_print_date(dol_mktime(12,0,0,$i,1,$year),"%b"),
+ $data[$i-1] = array(dol_print_date(dol_mktime(12,0,0,$i,1,$year),"%b"),
$data1[$i][1],
$data2[$i][1]);
}
diff --git a/htdocs/expedition/stats/pre.inc.php b/htdocs/expedition/stats/pre.inc.php
index f1582422897..4c9fc9e3f36 100644
--- a/htdocs/expedition/stats/pre.inc.php
+++ b/htdocs/expedition/stats/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/product/stats/pre.inc.php
\ingroup expedition
\brief Fichier gestionnaire du menu gauche des statistiques expedition
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -34,7 +31,7 @@ $langs->load("orders");
function llxHeader($head = "", $title="", $urlp = "")
{
global $langs;
-
+
top_menu($head, $title);
$menu = new Menu();
@@ -44,7 +41,7 @@ function llxHeader($head = "", $title="", $urlp = "")
$menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings"));
$menu->add_submenu(DOL_URL_ROOT."/expedition/liste.php", $langs->trans("List"));
$menu->add_submenu(DOL_URL_ROOT."/expedition/stats/", $langs->trans("Statistics"));
-
+
left_menu($menu->liste);
}
?>
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index d8e318aef0a..9c3c07f78c2 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -16,16 +16,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/fichinter/apercu.php
\ingroup fichinter
\brief Page de l'onglet aper�u d'une fiche d'intervention
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/fichinter/pre.inc.php b/htdocs/fichinter/pre.inc.php
index 7a15937b766..3c31955f2c8 100644
--- a/htdocs/fichinter/pre.inc.php
+++ b/htdocs/fichinter/pre.inc.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
require("../main.inc.php");
diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php
index 92a232e6ddf..ec8bf183ad7 100644
--- a/htdocs/fichinter/rapport.php
+++ b/htdocs/fichinter/rapport.php
@@ -17,9 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id$
- * $Source$
- *
+ * $Id$
*/
require("./pre.inc.php");
@@ -107,7 +105,7 @@ if ( $db->query($sql) )
if (empty($socid))
print '<td>'.$langs->trans("Customers").'</td>';
print '<td align="center">'.$langs->trans("Description").'</td>';
-
+
print '<td align="center">Date</td>';
print '<td align="center">'.$langs->trans("Duration").'</td>';
print "</tr>\n";
@@ -132,7 +130,7 @@ if ( $db->query($sql) )
print '<td align="center">'.sprintf("%.1f",$objp->duree).'</td>';
$DureeTotal += $objp->duree;
print "</tr>\n";
-
+
$i++;
}
print "</table>";
diff --git a/htdocs/fourn/commande/pre.inc.php b/htdocs/fourn/commande/pre.inc.php
index 5b73e807928..805b082a564 100644
--- a/htdocs/fourn/commande/pre.inc.php
+++ b/htdocs/fourn/commande/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
- *
*/
/**
- \file htdocs/fourn/commande/pre.inc.php
- \ingroup compta
- \brief Fichier gestionnaire du menu commandes fournisseurs
+ * \file htdocs/fourn/commande/pre.inc.php
+ * \ingroup compta
+ * \brief Fichier gestionnaire du menu commandes fournisseurs
+ * \version $Id$
*/
require("../../main.inc.php");
diff --git a/htdocs/fourn/facture/pre.inc.php b/htdocs/fourn/facture/pre.inc.php
index 3992ddf0390..8e201fc7561 100644
--- a/htdocs/fourn/facture/pre.inc.php
+++ b/htdocs/fourn/facture/pre.inc.php
@@ -15,16 +15,14 @@
* 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$
- * $Source$
*/
/**
- \file htdocs/fourn/facture/pre.inc.php
- \ingroup fournisseur,facture
- \brief Fichier gestionnaire du menu factures fournisseurs
- */
+ \file htdocs/fourn/facture/pre.inc.php
+ \ingroup fournisseur,facture
+ \brief Fichier gestionnaire du menu factures fournisseurs
+ \version $Id$
+*/
require("../../main.inc.php");
require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.class.php";
@@ -49,7 +47,7 @@ function llxHeader($head = '', $title = '', $help_url='')
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
}
- // S�curit� acc�s client
+ // S�curit� acc�s client
if ($user->societe_id == 0 && $user->rights->societe->creer)
{
$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier"));
@@ -107,7 +105,7 @@ function llxHeader($head = '', $title = '', $help_url='')
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
}
- // S�curit� acc�s client
+ // S�curit� acc�s client
if ($user->societe_id == 0 && $user->rights->societe->creer)
{
$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier"));
diff --git a/htdocs/fourn/paiement/pre.inc.php b/htdocs/fourn/paiement/pre.inc.php
index 9089fece15c..288950affb7 100644
--- a/htdocs/fourn/paiement/pre.inc.php
+++ b/htdocs/fourn/paiement/pre.inc.php
@@ -14,16 +14,13 @@
* 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$
- * $Source$
- *
*/
/**
\file htdocs/fourn/paiement/pre.inc.php
\ingroup fournisseur,facture
\brief Fichier gestionnaire du menu paiements factures fournisseurs
+ \version $Id$
*/
require("../../main.inc.php");
@@ -49,15 +46,15 @@ function llxHeader($head = "", $title = "", $addons='') {
}
- if ($conf->fournisseur->enabled)
+ if ($conf->fournisseur->enabled)
{
if ($user->rights->societe->lire)
{
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
}
- // S�curit� acc�s client
- if ($user->societe_id == 0 && $user->rights->societe->creer)
+ // S�curit� acc�s client
+ if ($user->societe_id == 0 && $user->rights->societe->creer)
{
$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier"));
}
@@ -70,14 +67,14 @@ function llxHeader($head = "", $title = "", $addons='') {
$menu->add_submenu(DOL_URL_ROOT."/fourn/contact.php",$langs->trans("Contacts"));
}
}
-
+
$langs->load("bills");
if ($user->rights->fournisseur->facture->lire)
{
$menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"));
}
-
+
if ($user->rights->fournisseur->facture->creer)
{
@@ -88,7 +85,7 @@ function llxHeader($head = "", $title = "", $addons='') {
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"));
}
-
+
$langs->load("orders");
if ($user->rights->fournisseur->commande->lire)
{
@@ -100,7 +97,7 @@ function llxHeader($head = "", $title = "", $addons='') {
{
$menu->add(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("Products"));
}
-
+
left_menu($menu->liste);
}
diff --git a/htdocs/fourn/product/fourn.php b/htdocs/fourn/product/fourn.php
index 6f73727d160..7a29329f90f 100644
--- a/htdocs/fourn/product/fourn.php
+++ b/htdocs/fourn/product/fourn.php
@@ -14,17 +14,13 @@
* 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$
- * $Source$
- *
*/
-/*!
+/**
\file htdocs/fourn/product/fourn.php
\ingroup product
\brief Page de la fiche produit fournisseur
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php
index 9260cef3b6e..b8be16c3b82 100644
--- a/htdocs/fourn/product/index.php
+++ b/htdocs/fourn/product/index.php
@@ -15,17 +15,13 @@
* 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$
- * $Source$
- *
*/
-/*!
+/**
\file htdocs/product/index.php
\ingroup product
\brief Page accueil des produits et services
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/fourn/product/pre.inc.php b/htdocs/fourn/product/pre.inc.php
index 89b5a55bc67..fe6d2f90e26 100644
--- a/htdocs/fourn/product/pre.inc.php
+++ b/htdocs/fourn/product/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/fourn/product/pre.inc.php
\ingroup product,service
\brief Fichier gestionnaire du menu gauche des produits et services fournisseurs
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
diff --git a/htdocs/includes/boxes/box_energie_graph.php b/htdocs/includes/boxes/box_energie_graph.php
index 6f01046a92b..1ea2105c69c 100644
--- a/htdocs/includes/boxes/box_energie_graph.php
+++ b/htdocs/includes/boxes/box_energie_graph.php
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
@@ -48,8 +47,8 @@ class box_energie_graph 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)
{
@@ -66,7 +65,7 @@ class box_energie_graph extends ModeleBoxes {
$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);
diff --git a/htdocs/includes/boxes/box_energie_releve.php b/htdocs/includes/boxes/box_energie_releve.php
index 6d3388884e3..823b4ca3639 100644
--- a/htdocs/includes/boxes/box_energie_releve.php
+++ b/htdocs/includes/boxes/box_energie_releve.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
@@ -47,8 +45,8 @@ class box_energie_releve 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)
{
@@ -76,7 +74,7 @@ class box_energie_releve extends ModeleBoxes {
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);
@@ -84,11 +82,11 @@ class box_energie_releve extends ModeleBoxes {
$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++;
}
}
diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index d7b4eee6c6b..7133103fbfb 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,5 @@
--
-- $Id$
--- $Source$
-- $Revision$
--
-- Menu auguria entries
diff --git a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php b/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
index d6a02148f63..1eff1877d68 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
@@ -16,16 +16,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
- *
- * $Id$
- * $Source$
*/
/**
\file htdocs/includes/modules/societe/mod_codecompta_digitaria.class.php
\ingroup societe
\brief Fichier de la classe des gestion digitaria des codes compta des societes clientes
- \version $Revision$
+ \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
@@ -53,11 +50,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
/**
* \brief Renvoi code
- * \param DB Handler d'acc�s base
+ * \param DB Handler d'acc�s base
* \param societe Objet societe
*/
function get_code($DB, $societe)
- {
+ {
$i = 0;
$this->db = $DB;
@@ -87,7 +84,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
}
}
-
+
function verif($db, $code)
{
$sql = "SELECT code_compta FROM ".MAIN_DB_PREFIX."societe";
diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
index dabd6b9fb56..3f4e6b25274 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
@@ -16,16 +16,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
- *
- * $Id$
- * $Source$
*/
/**
\file htdocs/includes/modules/societe/mod_codecompta_panicum.class.php
\ingroup societe
\brief Fichier de la classe des gestion panicum des codes compta des societes clientes
- \version $Revision$
+ \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
@@ -40,21 +37,21 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
{
var $nom;
-
+
function mod_codecompta_panicum()
{
$this->nom = "Panicum";
}
-
-
+
+
function info($langs)
{
return $langs->trans("ModuleCompanyCode".$this->nom);
}
-
+
/**
* \brief Renvoi code
- * \param DB Handler d'acc�s base
+ * \param DB Handler d'acc�s base
* \param societe Objet societe
*/
function get_code($DB, $societe)
diff --git a/htdocs/lib/bookmark.lib.php b/htdocs/lib/bookmark.lib.php
index b363cd3e9d6..4de73cbb1e1 100644
--- a/htdocs/lib/bookmark.lib.php
+++ b/htdocs/lib/bookmark.lib.php
@@ -15,15 +15,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
- *
- * $Id$
- * $Source$
*/
/**
\file htdocs/lib/invoice.lib.php
\brief Ensemble de fonctions de base pour le module factures
- \version $Revision$
+ \version $Id$
Ensemble de fonctions de base de dolibarr sous forme d'include
*/
diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index dbd50f35634..4a396f41c8c 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -15,16 +15,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
- *
- * $Id$
- * $Source$
*/
/**
\file htdocs/lib/ldap.lib.php
\brief Ensemble de fonctions de base pour le module LDAP
\ingroup ldap
- \version $Revision$
+ \version $Id$
Ensemble de fonctions de base de dolibarr sous forme d'include
*/
diff --git a/htdocs/mantis/mantistop.php b/htdocs/mantis/mantistop.php
index 37f1bf52429..2b8c117c857 100644
--- a/htdocs/mantis/mantistop.php
+++ b/htdocs/mantis/mantistop.php
@@ -14,17 +14,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/mantis/mantistop.php
\ingroup mantis
- \brief Frame du haut Dolibarr pour l'affichage de mantis
- \author Laurent Destailleur
- \version $Revision$
+ \brief Top frame to show mantis application
+ \version $Id$
*/
require ("../main.inc.php");
diff --git a/htdocs/oscommerce_ws/produits/index.php b/htdocs/oscommerce_ws/produits/index.php
index d988ff23f22..71e24300f7d 100644
--- a/htdocs/oscommerce_ws/produits/index.php
+++ b/htdocs/oscommerce_ws/produits/index.php
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
require("./pre.inc.php");
@@ -58,7 +57,7 @@ elseif (!($err = $client->getError()) )
// un produit osc
$OscProd = new Osc_Product($db);
-
+
if ($num > 0) {
print "<TABLE width=\"100%\" class=\"noborder\">";
print '<TR class="liste_titre">';
@@ -71,7 +70,7 @@ elseif (!($err = $client->getError()) )
print '<TD align="center">Status</TD>';
print '<TD align="center">Importer</TD>';
print "</TR>\n";
-
+
while ($i < $num) {
$var=!$var;
$prodid = $OscProd->get_productid($result[$i][OSC_id]);
@@ -97,7 +96,7 @@ elseif (!($err = $client->getError()) )
}
}
else {
- dol_print_error('',"Erreur service web ".$client->faultstring);
+ dol_print_error('',"Erreur service web ".$client->faultstring);
}
print "</TABLE>";
diff --git a/htdocs/phenix/phenixtop.php b/htdocs/phenix/phenixtop.php
index 458f0909a99..6494299855d 100644
--- a/htdocs/phenix/phenixtop.php
+++ b/htdocs/phenix/phenixtop.php
@@ -14,9 +14,6 @@
* 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$
- * $Source$
*/
/**
@@ -24,7 +21,7 @@
\ingroup phenix
\brief Frame du haut Dolibarr pour l'affichage du calendrier
\author Laurent Destailleur
- \version $Revision$
+ \version $Id$
*/
require ("../main.inc.php");
diff --git a/htdocs/product/droitpret/droitpret.class.php b/htdocs/product/droitpret/droitpret.class.php
index aaa33771c75..dc0954cb57c 100644
--- a/htdocs/product/droitpret/droitpret.class.php
+++ b/htdocs/product/droitpret/droitpret.class.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/product/droitpret/droitpret.class.php
\ingroup pret
- \brief Fichier de la classe ddes droits de pr�ts
- \version $Revision$
+ \brief Fichier de la classe ddes droits de pr�ts
+ \version $Id$
*/
@@ -35,8 +32,8 @@
class DroitPret
{
-
-
+
+
var $index;
var $dated;
var $datef;
@@ -45,11 +42,11 @@ class DroitPret
var $refFile;
var $fp;
var $nbfact;
-
+
function DroitPret($DB,$dated,$datef)
{
global $conf;
-
+
$this->db=$DB;
$this->index = 0;
$this->dated = $dated;
@@ -57,16 +54,16 @@ class DroitPret
$this->dateEnvoie = getdate();
$this->format = "aa";
$this->refFile = $conf->global->MAIN_INFO_SOCIETE_GENCOD."_".date("dmY",mktime($this->dateEnvoie['hours'],$this->dateEnvoie['minutes'],$this->dateEnvoie['seconds'],$this->dateEnvoie['mon'],$this->dateEnvoie['mday'],$this->dateEnvoie['year'])).".csv";
-
+
}
-
+
function CreateNewRapport()
{
global $conf;
-
+
$this->nbfact = 0;
-
+
$dateEnvoie = date("Y-m-d H:i:s",mktime($this->dateEnvoie['hours'],$this->dateEnvoie['minutes'],$this->dateEnvoie['seconds'],$this->dateEnvoie['mon'],$this->dateEnvoie['mday'],$this->dateEnvoie['year']));
$sql = "INSERT INTO ".MAIN_DB_PREFIX."droitpret_rapport(date_envoie,format,date_debut,date_fin,fichier,nbfact) VALUES('".$dateEnvoie."','".$this->format."','".date("Y-m-d H:i:s",$this->dated)."','".date("Y-m-d H:i:s",$this->datef)."','".$this->refFile."',0)";
@@ -80,26 +77,26 @@ class DroitPret
$this->WriteTET();
$this->WriteFin();
fclose($this->fp);
-
+
$sql = "UPDATE ".MAIN_DB_PREFIX."droitpret_rapport SET nbfact = ".$this->nbfact." WHERE rowid = ".$ref;
$this->db->query($sql);
}
-
+
function WriteDEB($ref)
{
-
+
$dateEnvoie = date("Ymd",mktime($this->dateEnvoie['hours'],$this->dateEnvoie['minutes'],$this->dateEnvoie['seconds'],$this->dateEnvoie['mon'],$this->dateEnvoie['mday'],$this->dateEnvoie['year']));
$ligne = "DEB".$this->ComplChar($ref,"0",8).$dateEnvoie;
$ligne .= $this->ComplChar($this->format," ",10);
fwrite($this->fp,$ligne."\n");
}
-
+
function WriteTET()
{
global $conf;
-
+
$sql = "SELECT f.rowid, f.facnumber, f.datec, f.total_ttc, f.total ";
$sql.= "FROM llx_facture AS f, llx_facturedet AS d, llx_product AS p, llx_societe AS s, llx_categorie_societe AS c ";
$sql.= "WHERE f.fk_soc = s.rowid ";
@@ -107,7 +104,7 @@ class DroitPret
$sql.= "AND d.fk_product = p.rowid ";
$sql.= "AND f.rowid = d.fk_facture ";
$sql.= "AND f.datec >= '".date("Y-m-d H:i:s",$this->dated)."' ";
- $sql.= "AND f.datec < '".date("Y-m-d H:i:s",$this->datef)."' ";
+ $sql.= "AND f.datec < '".date("Y-m-d H:i:s",$this->datef)."' ";
$sql.= "AND c.fk_categorie = ".$conf->global->DROITPRET_CAT." ";
$sql.= "GROUP BY f.rowid";
@@ -117,26 +114,26 @@ class DroitPret
{
$num = $this->db->num_rows($result);
$i = 0;
-
+
while ($i < $num)
{
- $obj = $this->db->fetch_object($result);
+ $obj = $this->db->fetch_object($result);
$ligne = "TET380".$this->ComplChar($obj->facnumber,"0",25);
$ligne.= $this->FormatDate($obj->datec);
$ligne.= $this->ComplChar("","",25).$this->ComplChar(str_replace(".","",$obj->total_ttc),"0",10);
$ligne.= $this->ComplChar(str_replace(".","",$obj->total),"0",10)."EUR";
fwrite($this->fp,$ligne."\n");
-
+
$this->WriteInt($obj->rowid);
$this->WriteLin($obj->rowid);
-
+
$this->nbfact++;
$i++;
- }
+ }
}
-
+
}
-
+
function WriteINT($fac)
{
global $conf;
@@ -144,7 +141,7 @@ class DroitPret
$sql.= "FROM llx_facture AS f, llx_societe AS s ";
$sql.= "WHERE f.fk_soc = s.rowid ";
$sql.= "AND f.rowid = ".$fac." ";
-
+
$result = $this->db->query($sql);
if ($result)
@@ -159,12 +156,12 @@ class DroitPret
fwrite($this->fp,$ligne."\n");
$i++;
}
- }
-
-
-
- }
-
+ }
+
+
+
+ }
+
function WriteLIN($fac)
{
$sql = "SELECT p.gencode, d.total_ttc,d.qty ";
@@ -172,7 +169,7 @@ class DroitPret
$sql.= "WHERE d.fk_product = p.rowid ";
$sql.= "AND f.rowid = d.fk_facture ";
$sql.= "AND f.rowid = ".$fac." ";
-
+
$result = $this->db->query($sql);
if ($result)
@@ -190,21 +187,21 @@ class DroitPret
$i++;
}
}
-
+
}
-
+
function WriteFIN()
{
-
+
$ligne = "FIN".$this->ComplChar($obj->nbfact,"0",8);
fwrite($this->fp,$ligne);
}
-
-
+
+
function EnvoiMail()
{
global $langs, $conf;
-
+
$subject = ":::EDLFDT01".$this->ComplChar($conf->global->MAIN_INFO_SOCIETE_GENCOD,"0",13);
$sendto = $conf->global->DROITPRET_MAIL;
$from = $conf->global->MAIN_INFO_SOCIETE_MAIL;
@@ -233,7 +230,7 @@ class DroitPret
else
{
$mesg='<div class="error">';
- if ($mailfile->error)
+ if ($mailfile->error)
{
$mesg.="error";
$mesg.='<br>'.$mailfile->error;
@@ -243,12 +240,12 @@ class DroitPret
$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
}
$mesg.='</div>';
-
+
}
}
return $mesg;
}
-
+
function ComplChar($chaine,$char,$size)
{
$chaineSize=strlen ($chaine);
@@ -259,16 +256,16 @@ class DroitPret
}
return $ComplChar;
-
+
}
-
+
function FormatDate($datetime)
{
$FormatDate = str_replace("-","",$datetime);
$FormatDate = substr($FormatDate,0,8);
return $FormatDate;
}
-
+
}
?>
\ No newline at end of file
diff --git a/htdocs/product/droitpret/modules_droitpret.php b/htdocs/product/droitpret/modules_droitpret.php
index 11a3c62d55d..e72fc0442b1 100644
--- a/htdocs/product/droitpret/modules_droitpret.php
+++ b/htdocs/product/droitpret/modules_droitpret.php
@@ -15,42 +15,39 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
- *
- * $Id$
- * $Source$
*/
/**
\file htdocs/product/droitpret/modules_droipret.php
\ingroup droitpret
- \brief Fichier contenant la classe m�re de generation des exports de droits de prets
- \version $Revision$
+ \brief Fichier contenant la classe m�re de generation des exports de droits de prets
+ \version $Id$
*/
/**
\class ModeleDroitPret
- \brief Classe m�re des mod�les de format d'export de droits de pr�ts
+ \brief Classe m�re des mod�les de format d'export de droits de pr�ts
*/
class ModeleDroitPret
{
-
+
/**
* \brief Constructeur
*/
function ModeleDroitPret()
{
}
-
+
/**
- * \brief Charge en memoire et renvoie la liste des mod�les actifs
+ * \brief Charge en memoire et renvoie la liste des mod�les actifs
* \param db Handler de base
*/
function liste_rapport($db)
{
-
+
$liste=array();
$sql ="SELECT rowid, fichier";
$sql.=" FROM ".MAIN_DB_PREFIX."droitpret_rapport";
@@ -71,8 +68,8 @@ class ModeleDroitPret
{
dol_print_error($db);
return -1;
- }
-
+ }
+
return $liste;
}
@@ -80,7 +77,7 @@ class ModeleDroitPret
-
+
}
diff --git a/htdocs/product/droitpret/pre.inc.php b/htdocs/product/droitpret/pre.inc.php
index 36786c9b6b5..9f3df6168af 100644
--- a/htdocs/product/droitpret/pre.inc.php
+++ b/htdocs/product/droitpret/pre.inc.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
+/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
*
* 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
@@ -14,16 +14,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/compta/droitpret/pre.inc.php
\ingroup pret
\brief Fichier gestionnaire du menu de gauche de l'espace droitpret
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -31,13 +28,13 @@ require("../../main.inc.php");
function llxHeader($head = "", $title="", $help_url='')
{
global $langs;
-
+
top_menu($head, $title);
-
+
$menu = new Menu();
-
-
-
+
+
+
left_menu($menu->liste, $help_url);
}
diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php
index febf12cf937..2257aad3435 100644
--- a/htdocs/product/stats/index.php
+++ b/htdocs/product/stats/index.php
@@ -16,16 +16,12 @@
* 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$
- * $Source$
- *
*/
/**
\file htdocs/product/stats/index.php
\brief Page accueil statistiques produits
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/product/stats/pre.inc.php b/htdocs/product/stats/pre.inc.php
index bdd79452026..e276470c119 100644
--- a/htdocs/product/stats/pre.inc.php
+++ b/htdocs/product/stats/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/product/stats/pre.inc.php
\ingroup product,service
\brief Fichier gestionnaire du menu gauche des statistiques de produits et services
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 0638fe6e4ed..10e4d912a64 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -16,16 +16,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
- *
- * $Id$
- * $Source$
*/
/**
* \file htdocs/product/traduction.php
* \ingroup product
* \brief Page de traduction des produits
- * \version $Revision$
+ * \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/rapport/AtomeFactureValidee.class.php b/htdocs/rapport/AtomeFactureValidee.class.php
index 9be04e2ee85..4f8959e1b50 100644
--- a/htdocs/rapport/AtomeFactureValidee.class.php
+++ b/htdocs/rapport/AtomeFactureValidee.class.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
include_once(DOL_DOCUMENT_ROOT.'/rapport/Atome.class.php');
@@ -41,12 +39,12 @@ class AtomeFactureValidee extends Atome
}
/**
- *
+ *
*
*
*/
function fetch()
- {
+ {
if ($this->periode == 'year')
{
$sql = "SELECT date_format(f.datef,'%Y%m'), sum(f.amount) as am";
@@ -74,7 +72,7 @@ class AtomeFactureValidee extends Atome
while ($i < $num)
{
$row = $this->db->fetch_row($i);
-
+
$arr[$row[0]] = $row[1];
//print $row[0] .'-'.$row[1]. '<br>';
$i++;
@@ -89,7 +87,7 @@ class AtomeFactureValidee extends Atome
print $this->db->error();
print "<br>$sql";
return -3;
- }
- }
+ }
+ }
}
?>
diff --git a/htdocs/rapport/AtomePropaleValidee.class.php b/htdocs/rapport/AtomePropaleValidee.class.php
index c9317f5d040..c592f352ea6 100644
--- a/htdocs/rapport/AtomePropaleValidee.class.php
+++ b/htdocs/rapport/AtomePropaleValidee.class.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
include_once(DOL_DOCUMENT_ROOT.'/rapport/Atome.class.php');
@@ -39,7 +37,7 @@ class AtomePropaleValidee extends Atome
}
/**
- *
+ *
*
*
*/
@@ -48,7 +46,7 @@ class AtomePropaleValidee extends Atome
$sql = "SELECT date_format(f.datep,'%Y%m'), sum(f.price) as am";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as f";
$sql .= " WHERE f.fk_statut = 2";
-
+
if ($this->year)
{
$sql .= " AND date_format(f.datep,'%Y') = $this->year ";
@@ -63,7 +61,7 @@ class AtomePropaleValidee extends Atome
while ($i < $num)
{
$row = $this->db->fetch_row($i);
-
+
$arr[$row[0]] = $row[1];
$i++;
@@ -76,7 +74,7 @@ class AtomePropaleValidee extends Atome
{
print $this->db->error();
return -3;
- }
- }
+ }
+ }
}
?>
diff --git a/htdocs/rapport/index.php b/htdocs/rapport/index.php
index 0f8e32eb544..0e8aa03818b 100644
--- a/htdocs/rapport/index.php
+++ b/htdocs/rapport/index.php
@@ -16,9 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
+
require("./pre.inc.php");
require("./AtomeFactureValidee.class.php");
@@ -34,21 +33,21 @@ print_fiche_titre("Rapports");
* Initialisation d'un atome
*
* Parametre
- * - id de connexion � la bdd
- * - p�riode 'year' ou 'month' (Reste � faire les hebdo)
- * - une date dans la p�riode voulue
+ * - id de connexion � la bdd
+ * - p�riode 'year' ou 'month' (Reste � faire les hebdo)
+ * - une date dans la p�riode voulue
* -> retourne un objet
*
*/
$x = new AtomeFactureValidee($db,'year', time());
/*
- * Lecture des donn�es
+ * Lecture des donn�es
* -> retourne un tableau
*/
$arr = $x->fetch();
/*
- * Cr�ation du graph
+ * Cr�ation du graph
* -> retounre le nom du fichier
*/
$img = $x->ShowGraph();
@@ -66,10 +65,10 @@ for ($i = 1 ; $i < 5; $i++)
{
$x = new AtomeFactureValidee($db,'month', mktime(12,0,0,$i,12,2003));
$x->periode = 'month';
-
+
$arr = $x->fetch('month');
-
-
+
+
$img = $x->ShowGraph();
print $img."<br>";
}
diff --git a/htdocs/rapport/pre.inc.php b/htdocs/rapport/pre.inc.php
index e1397651f7a..31a9681daf3 100644
--- a/htdocs/rapport/pre.inc.php
+++ b/htdocs/rapport/pre.inc.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
require ("../main.inc.php");
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index b4f0224c149..6216f06842e 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -14,16 +14,13 @@
* 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$
- * $Source$
*/
/**
* \file htdocs/societe/checkvat/checkVatPopup.php
* \ingroup societe
-* \brief Onglet societe d'une societe
-* \version $Revision$
+* \brief Popup screen to validate VAT
+* \version $Id$
*/
require ("../../main.inc.php");
@@ -59,15 +56,15 @@ else
print '<b>'.$langs->trans("Country").'</b>: '.$_REQUEST["countryCode"].'<br>';
print '<b>'.$langs->trans("VATIntraShort").'</b>: '.$_REQUEST["vatNumber"].'<br>';
print '<br>';
-
+
// Set the parameters to send to the WebService
$parameters = array("countryCode" => $_REQUEST["countryCode"],
"vatNumber" => $_REQUEST["vatNumber"]);
-
+
// Set the WebService URL
dol_syslog("Create soapclient_nusoap for URL=".$WS_DOL_URL);
$soapclient = new soapclient_nusoap($WS_DOL_URL);
-
+
// Call the WebService and store its result in $result.
dol_syslog("Call method ".$WS_METHOD);
$result = $soapclient->call($WS_METHOD,$parameters);
@@ -76,7 +73,7 @@ else
// print_r($result);
// print $soapclient->request.'<br>';
// print $soapclient->response.'<br>';
-
+
$messagetoshow='';
print '<b>'.$langs->trans("Response").'</b>:<br>';
@@ -88,16 +85,16 @@ else
}
elseif (eregi('TIMEOUT',$result['faultstring']))
{
- print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+ print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
$messagetoshow=$soapclient->response;
}
elseif (eregi('SERVER_BUSY',$result['faultstring']))
{
- print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+ print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
$messagetoshow=$soapclient->response;
}
// Syntaxe ko
- elseif (eregi('INVALID_INPUT',$result['faultstring'])
+ elseif (eregi('INVALID_INPUT',$result['faultstring'])
|| ($result['requestDate'] && ! $result['valid']))
{
if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
@@ -113,11 +110,11 @@ else
print $langs->trans("VATIntraValueIsValid").': ';
if (eregi('MS_UNAVAILABLE',$result['faultstring']))
{
- print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$_REQUEST["countryCode"]).'</font><br>';
+ print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$_REQUEST["countryCode"]).'</font><br>';
}
else
{
- if ($result['valid'])
+ if ($result['valid'])
{
print '<font class="ok">'.$langs->trans("Yes").'</font>';
print '<br>';
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 577a857bf2c..10d7c350685 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -15,24 +15,21 @@
* 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$
- * $Source$
*/
/**
- \file htdocs/societe/notify.index.php
+ \file htdocs/societe/notify/index.php
\ingroup notification
- \brief Liste des notifications r�alis�es
- \version $Revision$
+ \brief List of done notifications
+ \version $Id$
*/
-
+
require("./pre.inc.php");
$langs->load("companies");
$langs->load("banks");
-// S�curit� acc�s client
-if ($user->societe_id > 0)
+// S�curit� acc�s client
+if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
@@ -76,10 +73,10 @@ if ($result)
{
$num = $db->num_rows($result);
$i = 0;
-
+
$paramlist='';
print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, "index.php", $paramlist, $sortfield,$sortorder,'',$num);
-
+
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign="center"',$sortfield,$sortorder);
@@ -90,9 +87,9 @@ if ($result)
while ($i < $num)
{
$obj = $db->fetch_object($result);
-
+
$var=!$var;
-
+
print "<tr $bc[$var]>";
print "<td><a href=\"fiche.php?socid=".$obj->socid."\">$obj->nom</A></td>\n";
print "<td>".$obj->firstname." ".$obj->name."</td>\n";
diff --git a/htdocs/societe/notify/pre.inc.php b/htdocs/societe/notify/pre.inc.php
index 74814ad6310..f1a7b32836d 100644
--- a/htdocs/societe/notify/pre.inc.php
+++ b/htdocs/societe/notify/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/societe/notify/pre.inc.php
\ingroup product,service
\brief Fichier gestionnaire du menu gauche des notifications
- \version $Revision$
+ \version $Id$
*/
require ("../../main.inc.php");
diff --git a/htdocs/societe/pre.inc.php b/htdocs/societe/pre.inc.php
index b1f6ef71fb7..22eb512cfbf 100644
--- a/htdocs/societe/pre.inc.php
+++ b/htdocs/societe/pre.inc.php
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/societe/pre.inc.php
\ingroup company
\brief Fichier gestionnaire du menu gauche des notifications
- \version $Revision$
+ \version $Id$
*/
require ("../main.inc.php");
diff --git a/htdocs/theme/auguria/graph-color.php b/htdocs/theme/auguria/graph-color.php
index 88d2e144fd6..b0e5afbdc8b 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-2006 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2006 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
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/theme/auguria/graph-color.php
- \brief Fichier de d�claration des couleurs pour les graphiques
+ \brief Fichier de d�claration des couleurs pour les graphiques
\ingroup core
- \version $Revision$
+ \version $Id$
*/
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/theme/freelug/graph-color.php b/htdocs/theme/freelug/graph-color.php
index 03f68a85d0e..2c086656c0c 100755
--- a/htdocs/theme/freelug/graph-color.php
+++ b/htdocs/theme/freelug/graph-color.php
@@ -1,6 +1,6 @@
<?PHP
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2006 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
@@ -15,16 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/theme/freelug/graph-color.php
- \brief Fichier de d�claration des couleurs pour les graphiques
+ \brief Fichier de declaration des couleurs pour les graphiques
\ingroup core
- \version $Revision$
+ \version $Id$
*/
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/user/group/pre.inc.php b/htdocs/user/group/pre.inc.php
index 402aa29624b..9aed84f574a 100644
--- a/htdocs/user/group/pre.inc.php
+++ b/htdocs/user/group/pre.inc.php
@@ -15,15 +15,12 @@
* 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$
- * $Source$
*/
-/**
+/**
\file htdocs/user/group/pre.inc.php
\brief Fichier gestionnaire du menu groupe d'utilisateurs
- \version $Revision$
+ \version $Id$
*/
require("../../main.inc.php");
@@ -33,35 +30,35 @@ require(DOL_DOCUMENT_ROOT.'/usergroup.class.php');
function llxHeader($head = "", $urlp = "")
{
global $user, $langs;
-
+
top_menu($head);
-
+
$menu = new Menu();
-
-
+
+
if ($user->rights->user->user->lire || $user->admin)
{
$menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Users"));
$menu->add_submenu(DOL_URL_ROOT."/user/", $langs->trans("List"));
}
-
+
if($user->rights->user->user->creer || $user->admin)
{
$menu->add_submenu(DOL_URL_ROOT."/user/fiche.php?&action=create", $langs->trans("NewUser"));
}
-
+
if ($user->rights->user->user->lire || $user->admin)
{
$menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Groups"));
$menu->add_submenu(DOL_URL_ROOT."/user/group/", $langs->trans("List"));
}
-
+
if($user->rights->user->user->creer || $user->admin)
{
$menu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?&action=create", $langs->trans("NewGroup"));
}
-
-
+
+
left_menu($menu->liste);
}
diff --git a/htdocs/webcal/webcaltop.php b/htdocs/webcal/webcaltop.php
index 375cea0ad3b..0948b815f26 100644
--- a/htdocs/webcal/webcaltop.php
+++ b/htdocs/webcal/webcaltop.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006 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
@@ -14,17 +15,13 @@
* 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$
- * $Source$
*/
/**
\file htdocs/webcal/webcaltop.php
\ingroup webcalendar
- \brief Frame du haut Dolibarr pour l'affichage du calendrier
- \author Laurent Destailleur
- \version $Revision$
+ \brief Top frame to show calendar
+ \version $Id$
*/
require ("../main.inc.php");
diff --git a/scripts/company/export-csv-example.php b/scripts/company/export-csv-example.php
index 70a74a7969a..80782b44dc8 100644
--- a/scripts/company/export-csv-example.php
+++ b/scripts/company/export-csv-example.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*
* Export simple des contacts
*/
@@ -49,13 +47,13 @@ if ($db->query($sql))
{
$num = $db->num_rows();
- print "Lignes trait�es $num\n";
+ print "Lignes trait�es $num\n";
$i = 0;
$j = 1;
- $page->write_string(0, 0, "Soci�t�");
- $page->write_string(0, 1, "Pr�nom");
+ $page->write_string(0, 0, "Soci�t�");
+ $page->write_string(0, 1, "Pr�nom");
$page->write_string(0, 2, "Nom");
$page->write_string(0, 3, "Email");
@@ -63,7 +61,7 @@ if ($db->query($sql))
while ($i < $num)
{
- $obj = $db->fetch_object();
+ $obj = $db->fetch_object();
if ($obj->email <> $oldemail)
{
@@ -76,7 +74,7 @@ if ($db->query($sql))
$oldemail = $obj->email;
}
-
+
$i++;
}
diff --git a/scripts/energie/graph-line.php b/scripts/energie/graph-line.php
index 8e5c833cf12..6e1f7ff98f0 100644
--- a/scripts/energie/graph-line.php
+++ b/scripts/energie/graph-line.php
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
require_once("../../htdocs/master.inc.php");
@@ -64,66 +62,66 @@ if ($resql_c)
{
$num = $db->num_rows($resql);
$i = 0;
-
+
if ($num > 0)
{
$obj = $db->fetch_object($resql);
-
+
$previous_date = $obj->date_releve;
$previous_value = $obj->valeur;
-
+
$i++;
}
-
+
$datas = array();
$k = 0;
-
+
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
+
$delta = (($obj->date_releve - $previous_date) / 86400 );
-
+
if ($delta > 1)
{
for ($j = 1 ; $j < $delta ; $j++)
{
$value = $previous_value + ((($obj->valeur - $previous_value) / $delta) * $j);
-
+
$datas[$k][0] = $value;
$datas[$k][1] = ($previous_date + (86400 * $j));
$k++;
-
+
//print strftime("%Y-%m-%d", ($previous_date + (86400 * $j))) . "\t$j\t".$value."\n";
}
}
-
+
//print strftime("%Y-%m-%d", $obj->date_releve) . "\t\t".$obj->valeur."\n";
-
+
$datas[$k][0] = $obj->valeur;
$datas[$k][1] = $obj->date_releve;
$k++;
-
+
$previous_date = $obj->date_releve;
$previous_value = $obj->valeur;
- $i++;
+ $i++;
}
-
+
// Graph
$maxa = 0;
-
+
$xdatas = array();
$xlabels = array();
for ($i = 1 ; $i < sizeof($datas) ; $i++)
{
$xa = ($datas[$i][0] - $datas[($i-1)][0]);
-
+
$maxa = max($maxa, $xa);
-
+
$gdatas[$i-1] = $xa;
$glabels[$i-1] = strftime("%d%m",$datas[$i][1]);
-
+
$xdatas[$glabels[$i-1]] = $gdatas[$i-1];
}
@@ -143,17 +141,17 @@ if ($resql_c)
$day += 86400;
$xyear = strftime("%Y",$day);
}
-
+
if (sizeof($xydatas) > 2)
{
$width = 750;
$height = 300;
-
+
$file = $conf->energie->dir_graph."/all.".$obj_c->rowid.".png";
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
@@ -163,10 +161,10 @@ if ($resql_c)
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$plot = new LinePlot($xydatas);
$plot->xAxis->Hide();
-
+
$graph->add($plot);
$graph->draw($file);
@@ -177,7 +175,7 @@ if ($resql_c)
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
@@ -187,10 +185,10 @@ if ($resql_c)
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$plot = new LinePlot($xydatas);
$plot->xAxis->Hide();
-
+
$graph->add($plot);
$graph->draw($file);
}
diff --git a/scripts/energie/graph.php b/scripts/energie/graph.php
index f47646c5cdb..62b114dbcb6 100644
--- a/scripts/energie/graph.php
+++ b/scripts/energie/graph.php
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
require_once("../../htdocs/master.inc.php");
@@ -47,7 +46,7 @@ if ($resql_c)
$labels = array();
$datas = array();
-
+
$ydatas = array();
$mdatas = array();
$wdatas = array();
@@ -64,67 +63,67 @@ if ($resql_c)
{
$num = $db->num_rows($resql);
$i = 0;
-
+
if ($num > 0)
{
$obj = $db->fetch_object($resql);
-
+
//print strftime("%Y-%m-%d", $obj->date_releve) . "\t\t".$obj->valeur."\n";
-
+
$previous_date = $obj->date_releve;
$previous_value = $obj->valeur;
-
+
$i++;
}
-
+
$datas = array();
$k = 0;
-
+
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
+
$delta = (($obj->date_releve - $previous_date) / 86400 );
-
+
if ($delta > 1)
{
for ($j = 1 ; $j < $delta ; $j++)
{
$value = $previous_value + ((($obj->valeur - $previous_value) / $delta) * $j);
-
+
$datas[$k][0] = $value;
$datas[$k][1] = ($previous_date + (86400 * $j));
$k++;
-
+
//print strftime("%Y-%m-%d", ($previous_date + (86400 * $j))) . "\t$j\t".$value."\n";
}
}
-
+
//print strftime("%Y-%m-%d", $obj->date_releve) . "\t\t".$obj->valeur."\n";
-
+
$datas[$k][0] = $obj->valeur;
$datas[$k][1] = $obj->date_releve;
$k++;
-
+
$previous_date = $obj->date_releve;
$previous_value = $obj->valeur;
- $i++;
+ $i++;
}
-
+
// Graph
$maxa = 0;
-
+
for ($i = 1 ; $i < sizeof($datas) ; $i++)
{
$xa = ($datas[$i][0] - $datas[($i-1)][0]);
-
+
$maxa = max($maxa, $xa);
-
+
$gdatas[$i-1] = $xa;
$glabels[$i-1] = '';//strftime("%d%m",$datas[$i][1]);
-
+
$month = strftime("%m%y",$datas[$i][1]);
-
+
$mdatas[$compteur_id][$month] = $mdatas[$compteur_id][$month] + $xa;
$week = strftime("%W%y",$datas[$i][1]);
@@ -135,7 +134,7 @@ if ($resql_c)
$ydatas[$compteur_id][$year] = $ydatas[$compteur_id][$year] + $xa;
}
-
+
$width = 750;
$height = 300;
if (sizeof($gdatas) > 2)
@@ -144,7 +143,7 @@ if ($resql_c)
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
@@ -154,18 +153,18 @@ if ($resql_c)
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$plot = new LinePlot($gdatas);
-
+
$plot->xAxis->setLabelText($glabels);
$plot->xAxis->label->setFont(new Tuffy(7));
-
+
$graph->add($plot);
$graph->draw($file);
}
$width = 450;
$height = 300;
-
+
// Mensuel
$i=0;
foreach ($mdatas[$compteur_id] as $key => $value)
@@ -180,7 +179,7 @@ if ($resql_c)
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
@@ -190,14 +189,14 @@ if ($resql_c)
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$plot = new BarPlot($gmdatas);
$col = "blue";
$color = new $col ;
$plot->setBarColor($color);
$plot->xAxis->setLabelText($gmlabels);
$plot->xAxis->label->setFont(new Tuffy(7));
-
+
$graph->add($plot);
$graph->draw($file);
}
@@ -217,7 +216,7 @@ if ($resql_c)
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
@@ -227,14 +226,14 @@ if ($resql_c)
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$plot = new BarPlot($gwdatas);
$col = "blue";
$color = new $col ;
$plot->setBarColor($color);
$plot->xAxis->setLabelText($gwlabels);
$plot->xAxis->label->setFont(new Tuffy(7));
-
+
$graph->add($plot);
$graph->draw($file);
}
@@ -249,14 +248,14 @@ if ($resql_c)
$gylabels[$i] = $key;
$i++;
}
-
+
if (sizeof($gydatas))
{
$file = $conf->energie->dir_graph."/year.".$obj_c->rowid.".png";
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
@@ -266,17 +265,17 @@ if ($resql_c)
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$plot = new BarPlot($gydatas);
$col = "blue";
$color = new $col ;
$plot->setBarColor($color);
$plot->xAxis->setLabelText($gylabels);
$plot->xAxis->label->setFont(new Tuffy(7));
-
+
$graph->add($plot);
$graph->draw($file);
- }
+ }
}
else
{
@@ -294,7 +293,7 @@ else
}
/*************************************************************
* Groupes
- *
+ *
*/
$sql_g = "SELECT distinct fk_energie_groupe";
@@ -310,52 +309,52 @@ if ($resql_g)
while ($i_g < $num_g)
{
$row_g = $db->fetch_row($resql_g);
-
+
$sql_c = "SELECT fk_energie_compteur";
$sql_c .= " FROM ".MAIN_DB_PREFIX."energie_compteur_groupe";
- $sql_c .= " WHERE fk_energie_groupe = ".$row_g[0];
-
+ $sql_c .= " WHERE fk_energie_groupe = ".$row_g[0];
+
$resql_c = $db->query($sql_c);
-
+
if ($resql_c)
{
$num_c = $db->num_rows($resql_c);
$i_c = 0;
-
+
$compteurs = array();
while ($i_c < $num_c)
{
$obj_c = $db->fetch_object($resql_c);
-
+
array_push($compteurs,$obj_c->fk_energie_compteur);
$i_c++;
}
-
+
$width = 450;
$height = 300;
// Hebdo
$file = $conf->energie->dir_graph."/groupe.week.".$row_g[0].".png";
-
+
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
-
+
$graph->title->set("Consommation hebdomadaire");
$graph->title->setFont(new Tuffy(10));
-
+
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$gbspl = array();
foreach ($compteurs as $cx)
{
$gydatas = array();
$gylabels = array();
-
+
$i=0;
foreach ($wdatas[$cx] as $key => $value)
{
@@ -363,7 +362,7 @@ if ($resql_g)
$gylabels[$i] = $key;
$i++;
}
-
+
array_push($gbspl, $bplot);
$plot = new BarPlot($gydatas);
@@ -372,33 +371,33 @@ if ($resql_g)
$plot->setBarColor($color);
$plot->xAxis->setLabelText($gylabels);
$plot->xAxis->label->setFont(new Tuffy(7));
- $graph->add($plot);
+ $graph->add($plot);
}
-
+
$graph->draw($file);
//
//
//
- $file = $conf->energie->dir_graph."/groupe.month.".$row_g[0].".png";
+ $file = $conf->energie->dir_graph."/groupe.month.".$row_g[0].".png";
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
-
+
$graph->title->set("Consommation mensuelle");
$graph->title->setFont(new Tuffy(10));
-
+
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$gbspl = array();
foreach ($compteurs as $cx)
{
$gydatas = array();
$gylabels = array();
-
+
$i=0;
foreach ($mdatas[$cx] as $key => $value)
{
@@ -406,7 +405,7 @@ if ($resql_g)
$gylabels[$i] = $key;
$i++;
}
-
+
array_push($gbspl, $bplot);
$plot = new BarPlot($gydatas);
@@ -416,9 +415,9 @@ if ($resql_g)
$plot->xAxis->setLabelText($gylabels);
$plot->xAxis->label->setFont(new Tuffy(7));
$graph->add($plot);
-
+
}
-
+
$graph->draw($file);
//
@@ -427,23 +426,23 @@ if ($resql_g)
$file = $conf->energie->dir_graph."/groupe.year.".$row_g[0].".png";
$group = new PlotGroup;
$group->setPadding(30, 10, NULL, NULL);
-
+
$graph = new Graph($width, $height);
$graph->border->hide();
$graph->setAntiAliasing(true);
-
+
$graph->title->set("Consommation annuelle");
$graph->title->setFont(new Tuffy(10));
-
+
$bgcolor= new Color(222,231,236);
$graph->setBackgroundColor($bgcolor);
-
+
$gbspl = array();
foreach ($compteurs as $cx)
{
$gydatas = array();
$gylabels = array();
-
+
$i=0;
foreach ($ydatas[$cx] as $key => $value)
{
@@ -451,7 +450,7 @@ if ($resql_g)
$gylabels[$i] = $key;
$i++;
}
-
+
array_push($gbspl, $bplot);
$plot = new BarPlot($gydatas);
@@ -461,9 +460,9 @@ if ($resql_g)
$plot->xAxis->setLabelText($gylabels);
$plot->xAxis->label->setFont(new Tuffy(7));
$graph->add($plot);
-
+
}
-
+
$graph->draw($file);
//
}
diff --git a/scripts/withdrawals/prelevement-verif.php b/scripts/withdrawals/prelevement-verif.php
index dbf956b41a5..cf5d6015ba8 100644
--- a/scripts/withdrawals/prelevement-verif.php
+++ b/scripts/withdrawals/prelevement-verif.php
@@ -15,15 +15,13 @@
* 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$
- * $Source$
*/
/**
- * \file scripts/prelevement/prelevement-verif.php
- * \ingroup prelevement
- * \brief V�rifie que les soci�t�s qui doivent �tre pr�lev�es ont bien un RIB correct
+ * \file scripts/prelevement/prelevement-verif.php
+ * \ingroup prelevement
+ * \brief Verifie que les societes qui doivent etre prelevees ont bien un RIB correct
+ * \version $Id$
*/
// Test si mode CLI
@@ -48,10 +46,10 @@ $error = 0;
$puser = new user($db, PRELEVEMENT_USER);
$puser->fetch();
-dol_syslog("Pr�l�vements effectu�s par ".$puser->fullname." [".PRELEVEMENT_USER."]");
+dol_syslog("Pr�l�vements effectu�s par ".$puser->fullname." [".PRELEVEMENT_USER."]");
dol_syslog("Raison sociale : ".PRELEVEMENT_RAISON_SOCIALE);
-dol_syslog("Num�ro Nation Emetteur : ".PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR);
+dol_syslog("Num�ro Nation Emetteur : ".PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR);
dol_syslog("Code etablissement : ".PRELEVEMENT_CODE_BANQUE);
dol_syslog("Code guichet : ". PRELEVEMENT_CODE_GUICHET);
@@ -59,7 +57,7 @@ dol_syslog("Numero compte : ".PRELEVEMENT_NUMERO_COMPTE);
/*
*
- * Lectures des factures a pr�lever
+ * Lectures des factures a pr�lever
*
*/
@@ -95,7 +93,7 @@ if (!$error)
$i++;
}
$db->free();
- dol_syslog("$i factures � pr�lever");
+ dol_syslog("$i factures � pr�lever");
}
else
{
@@ -107,18 +105,18 @@ if (!$error)
/*
*
- * V�rification des clients
+ * V�rification des clients
*
*/
if (!$error)
{
/*
- * V�rification des RIB
+ * V�rification des RIB
*
*/
$i = 0;
- dol_syslog("D�but v�rification des RIB");
+ dol_syslog("D�but v�rification des RIB");
if (sizeof($factures) > 0)
{
@@ -146,7 +144,7 @@ if (!$error)
}
else
{
- dol_syslog("Impossible de lire la soci�t�");
+ dol_syslog("Impossible de lire la soci�t�");
}
}
else
@@ -161,7 +159,7 @@ if (!$error)
}
}
-dol_syslog(sizeof($factures_prev)." factures sur ".sizeof($factures)." seront pr�lev�es");
+dol_syslog(sizeof($factures_prev)." factures sur ".sizeof($factures)." seront pr�lev�es");
$db->close();
diff --git a/scripts/withdrawals/prelevement.php b/scripts/withdrawals/prelevement.php
index be455892dac..9b137e1d064 100644
--- a/scripts/withdrawals/prelevement.php
+++ b/scripts/withdrawals/prelevement.php
@@ -15,15 +15,13 @@
* 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$
- * $Source$
*/
/**
- * \file scripts/prelevement/prelevement.php
- * \ingroup prelevement
- * \brief Script de prelevement
+ * \file scripts/prelevement/prelevement.php
+ * \ingroup prelevement
+ * \brief Script de prelevement
+ * \version $Id$
*/
// Test si mode CLI
@@ -97,7 +95,7 @@ if (!$error)
$i++;
}
$db->free();
- dol_syslog("$i factures � prelever");
+ dol_syslog("$i factures � prelever");
}
else
{
@@ -116,7 +114,7 @@ if (!$error)
if (!$error)
{
/*
- * V�rification des RIB
+ * V�rification des RIB
*
*/
$i = 0;
@@ -266,7 +264,7 @@ if (sizeof($factures_prev) > 0)
$pai->amounts = array();
$pai->amounts[$fac[0]] = $fact->total_ttc;
$pai->datepaye = $db->idate($datetimeprev);
- $pai->paiementid = 3; // pr�l�vement
+ $pai->paiementid = 3; // pr�l�vement
$pai->num_paiement = $ref;
if ($pai->create($user, 1) == -1) // on appelle en no_commit
@@ -282,7 +280,7 @@ if (sizeof($factures_prev) > 0)
$pai->valide();
/*
- * Ajout d'une ligne de pr�l�vement
+ * Ajout d'une ligne de pr�l�vement
*
*
* $fac[3] : banque
@@ -302,7 +300,7 @@ if (sizeof($factures_prev) > 0)
}
/*
- * Mise � jour des demandes
+ * Mise � jour des demandes
*
*/
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
@@ -363,7 +361,7 @@ if (sizeof($factures_prev) > 0)
}
/*
- * Mise � jour du total
+ * Mise � jour du total
*
*/
@@ -375,7 +373,7 @@ if (sizeof($factures_prev) > 0)
if (!$db->query($sql))
{
$error++;
- dol_syslog("Erreur mise � jour du total");
+ dol_syslog("Erreur mise � jour du total");
dol_syslog($sql);
}
--
GitLab