Remove pre.inc.php

htdocs/comm/action/document.php

@@ -27,7 +27,7 @@
  *       \version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php");

htdocs/comm/action/fiche.php

@@ -26,7 +26,7 @@
  *       \version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");

htdocs/comm/action/index.php

@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

htdocs/comm/action/info.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");

htdocs/comm/action/listactions.php

@@ -26,7 +26,7 @@
  *		\version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

htdocs/comm/action/pre.inc.php

@@ -1,71 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-	    \file       htdocs/comm/action/pre.inc.php
-		\ingroup	agenda
-		\brief      Left menu handler for acions area
-		\version    $Id$
-*/
-
-require("../../main.inc.php");
-
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-    global $conf,$user,$langs;
-
-    top_menu($head, $title);
-
-    $menu = new Menu();
-
-	// Actions
-	if ($conf->agenda->enabled)
-	{
-		$langs->load("agenda");
-
-		// Actions
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read);
-		// Calendar
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read);
-		if ($user->rights->agenda->allactions->read)
-		{
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read);
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read);
-		}
-		// List
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read);
-		if ($user->rights->agenda->allactions->read)
-		{
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read);
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read);
-		}
-		// Reports
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read);
-	}
-
-    left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/comm/action/rapport/index.php

@@ -26,7 +26,7 @@
  *		\version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");

htdocs/comm/action/rapport/pre.inc.php

@@ -1,71 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-	    \file       htdocs/comm/action/rapport/pre.inc.php
-		\brief      Fichier gestionnaire du menu de gauche de la zone rapport des actions
-		\version    $Id$
-*/
-
-require("../../../main.inc.php");
-
-
-function llxHeader($head = "", $urlp = "")
-{
-    global $conf,$user,$langs;
-    
-    top_menu($head);
-    
-    $menu = new Menu();
-    
-    
-	// Actions
-	if ($conf->agenda->enabled)
-	{
-		$langs->load("agenda");
-		
-		// Actions
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read);
-		// Calendar
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read);
-		if ($user->rights->agenda->allactions->read)
-		{
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read);
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read);
-		}
-		// List
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read);
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read);
-		if ($user->rights->agenda->allactions->read)
-		{
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read);
-			$menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read);
-		}
-		// Reports
-		$menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read);
-	}
-    
-    left_menu($menu->liste);
-}
-
-?>

htdocs/comm/addpropal.php

@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');

htdocs/comm/adresse_livraison.php

@@ -25,7 +25,7 @@
         \version    $Id$
 */
 
-require("pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/adresse_livraison.class.php");
 

htdocs/comm/bookmark.php

@@ -23,7 +23,8 @@
 */
 
 
-require("./pre.inc.php");
+require("../main.inc.php");
+
 
 
 llxHeader();

htdocs/comm/clients.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php");
 
 // Security check

htdocs/comm/contact.php

@@ -25,7 +25,7 @@
         \version    $Id$
 */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 
 $langs->load("companies");
 

htdocs/comm/fiche.php

@@ -29,7 +29,7 @@
  *       \version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");

htdocs/comm/index.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/client.class.php");
 if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");

htdocs/comm/mailing/cibles.php

@@ -25,7 +25,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");

htdocs/comm/mailing/fiche.php

@@ -24,7 +24,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");

htdocs/comm/mailing/index.php

@@ -24,7 +24,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
 $langs->load("commercial");

htdocs/comm/mailing/info.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
 

htdocs/comm/mailing/liste.php

@@ -24,7 +24,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 if (!$user->rights->mailing->lire) accessforbidden();
 

htdocs/comm/mailing/pre.inc.php

@@ -1,61 +0,0 @@
-<?php
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-        \file       htdocs/comm/mailing/pre.inc.php
-        \ingroup    mailing
-        \brief      Fichier de gestion du menu gauche de l'espace mailing
-        \version    $Id$
-*/
-
-require("../../main.inc.php");
-require_once DOL_DOCUMENT_ROOT.'/comm/mailing/mailing.class.php';
-
-$langs->load("companies");
-$langs->load("mails");
-$langs->load("exports");
-
-
-function llxHeader($head = "", $title = "", $help_url="")
-{
-    global $user, $conf, $langs;
-
-    top_menu($head, $title);
-
-    $menu = new Menu();
-
-    if ($user->rights->mailing->lire)
-    {
-        $menu->add(DOL_URL_ROOT."/comm/mailing/index.php", $langs->trans("Mailings"));
-    }
-
-    if ($user->rights->mailing->creer)
-    {
-        $menu->add_submenu(DOL_URL_ROOT."/comm/mailing/fiche.php?action=create", $langs->trans("NewMailing"));
-    }
-
-    if ($user->rights->mailing->lire)
-    {
-        $menu->add_submenu(DOL_URL_ROOT."/comm/mailing/liste.php", $langs->trans("List"));
-    }
-
-    left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/comm/multiprix.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 

htdocs/comm/pre.inc.php

@@ -1,115 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
- \file       htdocs/comm/pre.inc.php
- \ingroup    commercial
- \brief      Fichier de gestion du menu gauche de l'espace commercial
- \version    $Id$
- */
-require("../main.inc.php");
-
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-	global $user, $conf, $langs;
-
-	$langs->load("companies");
-	$langs->load("commercial");
-
-	top_menu($head, $langs->trans($title));
-
-	$menu = new Menu();
-
-	// Clients
-	$menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
-	if ($user->rights->societe->creer)
-	{
-		$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&amp;type=c", $langs->trans("MenuNewCustomer"));
-	}
-
-	$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts"));
-
-
-	// Prospects
-	$menu->add(DOL_URL_ROOT."/comm/prospect/index.php", $langs->trans("Prospects"));
-	if ($user->rights->societe->creer)
-	{
-		$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&amp;type=p", $langs->trans("MenuNewProspect"));
-	}
-
-	$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"));
-
-	// Propal
-	if ($conf->propal->enabled && $user->rights->propale->lire)
-	{
-		$langs->load("propal");
-		$menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=0", $langs->trans("PropalsDraft"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=1", $langs->trans("PropalsOpened"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=2,3,4", $langs->trans("PropalStatusClosedShort"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal/stats/", $langs->trans("Statistics"));
-	}
-
-	if ($conf->contrat->enabled && $user->rights->contrat->lire)
-	{
-		$langs->load("contracts");
-		$menu->add(DOL_URL_ROOT."/contrat/index.php", $langs->trans("Contracts"));
-	}
-
-	if ($conf->commande->enabled && $user->rights->commande->lire)
-	{
-		$langs->load("orders");
-		$menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders"));
-	}
-
-	if ($user->mailing->enabled && $user->rights->mailing->lire)
-	{
-		$langs->load("mails");
-		$menu->add(DOL_URL_ROOT."/comm/mailing/", $langs->trans("EMailings"));
-	}
-
-	if ($conf->ficheinter->enabled  && $user->rights->ficheinter->lire)
-	{
-		$langs->load("interventions");
-		$menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions"));
-	}
-
-	if (($conf->produit->enabled && $user->rights->produit->lire) || ($conf->service->enabled && $user->rights->service->lire))
-	{
-		$langs->load("products");
-		$chaine="";
-		if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
-		if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
-		if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
-		$menu->add(DOL_URL_ROOT."/product/index.php", "$chaine");
-	}
-
-	if ($conf->projet->enabled && $user->rights->projet->lire)
-	{
-		$langs->load("projects");
-		$menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects"));
-	}
-
-	left_menu($menu->liste, $help_url);
-}
-?>

htdocs/comm/propal.php

@@ -28,7 +28,7 @@
  *	\version		$Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

htdocs/comm/propal/apercu.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      <EFBFBD>ric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
@@ -26,7 +26,7 @@
  \version	$Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");

htdocs/comm/propal/contact.php

@@ -24,7 +24,7 @@
  *       \version    $Id$
  */
 
-require ("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

htdocs/comm/propal/document.php

@@ -22,11 +22,11 @@
 /**
  *       \file       htdocs/comm/propal/document.php
  *       \ingroup    propale
- *       \brief      Page de gestion des documents attach<EFBFBD>es <EFBFBD> une proposition commerciale
+ *       \brief      Page de gestion des documents attaches a une proposition commerciale
  *       \version    $Id$
  */
 
-require('./pre.inc.php');
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");

htdocs/comm/propal/info.php

@@ -25,7 +25,7 @@
 		\version    $Id$
 */
 
-require('./pre.inc.php');
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

htdocs/comm/propal/note.php

@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 

htdocs/comm/propal/pre.inc.php

@@ -1,107 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
- \file       htdocs/comm/propal/pre.inc.php
- \ingroup    propale
- \brief      Fichier de gestion du menu gauche du module propale
- \version    $Id$
- */
-
-require("../../main.inc.php");
-
-function llxHeader($head = "", $urlp = "") {
-	global $user, $conf, $langs;
-
-	$langs->load("companies");
-
-	top_menu($head);
-
-	$menu = new Menu();
-
-	// Clients
-	$menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
-	if ($user->rights->societe->creer)
-	{
-		$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&amp;type=c", $langs->trans("MenuNewCustomer"));
-	}
-	$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts"));
-
-	// Prospects
-	$menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects"));
-	if ($user->rights->societe->creer)
-	{
-		$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&amp;type=p", $langs->trans("MenuNewProspect"));
-	}
-	$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_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=0", $langs->trans("PropalsDraft"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=1", $langs->trans("PropalsOpened"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=2,3,4", $langs->trans("PropalStatusClosedShort"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal/stats/", $langs->trans("Statistics"));
-	}
-
-	if ($conf->contrat->enabled)
-	{
-		$langs->load("contracts");
-		$menu->add(DOL_URL_ROOT."/contrat/index.php", $langs->trans("Contracts"));
-	}
-
-	if ($conf->commande->enabled )
-	{
-		$langs->load("orders");
-		$menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders"));
-	}
-
-	if ($conf->ficheinter->enabled)
-	{
-		$langs->load("interventions");
-		$menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions"));
-	}
-
-	if ($conf->produit->enabled || $conf->service->enabled)
-	{
-		$langs->load("products");
-		$chaine="";
-		if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
-		if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
-		if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
-		$menu->add(DOL_URL_ROOT."/product/index.php", "$chaine");
-	}
-
-	if ($conf->projet->enabled )
-	{
-		$langs->load("projects");
-		$menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects"));
-	}
-
-	left_menu($menu->liste);
-
-}
-
-
-?>

htdocs/comm/propal/stats/index.php

@@ -25,14 +25,14 @@
 		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
 
 $WIDTH=500;
 $HEIGHT=200;
 
-// Sécurité accés client
+// S<EFBFBD>curit<EFBFBD> acc<63>s client
 if ($user->societe_id > 0)
 {
 	$action = '';

htdocs/comm/propal/stats/month.php

@@ -24,7 +24,7 @@
 		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
 

htdocs/comm/propal/stats/pre.inc.php

@@ -1,111 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
- \file       htdocs/comm/propal/stats/pre.inc.php
- \ingroup    propale
- \brief      Fichier de gestion du menu gauche du module propale stats
- \version    $Id$
- */
-
-require("../../../main.inc.php");
-
-function llxHeader($head = "", $urlp = "")
-{
-	global $user, $conf, $langs;
-
-	$langs->load("companies");
-
-	top_menu($head);
-
-	$menu = new Menu();
-
-	// Clients
-	$menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
-	if ($user->rights->societe->creer)
-	{
-		$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&amp;type=c", $langs->trans("MenuNewCustomer"));
-	}
-	$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts"));
-
-	// Prospects
-	$menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects"));
-	if ($user->rights->societe->creer)
-	{
-		$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&amp;type=p", $langs->trans("MenuNewProspect"));
-	}
-	$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_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=0", $langs->trans("PropalsDraft"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=1", $langs->trans("PropalsOpened"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=2,3,4", $langs->trans("PropalStatusClosedShort"));
-		$menu->add_submenu(DOL_URL_ROOT."/comm/propal/stats/", $langs->trans("Statistics"));
-	}
-
-	if ($conf->contrat->enabled)
-	{
-		$langs->load("contracts");
-		$menu->add(DOL_URL_ROOT."/contrat/index.php", $langs->trans("Contracts"));
-	}
-
-	if ($conf->commande->enabled )
-	{
-		$langs->load("orders");
-		$menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders"));
-	}
-
-	if ($user->rights->mailing->lire)
-	{
-		$langs->load("mails");
-		$menu->add(DOL_URL_ROOT."/comm/mailing/", $langs->trans("EMailings"));
-	}
-
-	if ($conf->ficheinter->enabled)
-	{
-		$langs->load("interventions");
-		$menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions"));
-	}
-
-	if ($conf->produit->enabled || $conf->service->enabled)
-	{
-		$langs->load("products");
-		$chaine="";
-		if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
-		if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
-		if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
-		$menu->add(DOL_URL_ROOT."/product/index.php", "$chaine");
-	}
-
-	if ($conf->projet->enabled )
-	{
-		$langs->load("projects");
-		$menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects"));
-	}
-
-	left_menu($menu->liste);
-}
-?>

htdocs/comm/recap-client.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 

htdocs/comm/remise.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 

htdocs/comm/remx.php

@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/discount.class.php");

htdocs/commande/apercu.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      <EFBFBD>ric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
@@ -22,11 +22,11 @@
 /**
 		\file		htdocs/commande/apercu.php
 		\ingroup	commande
-		\brief		Page de l'onglet aper<EFBFBD>u d'une commande
+		\brief		Page de l'onglet apercu d'une commande
 		\version	$Id$
 */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
 if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');

htdocs/commande/contact.php

@@ -25,7 +25,7 @@
         \version    $Id$
 */
 
-require ("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");

htdocs/commande/document.php

@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");

htdocs/commande/fiche.php

@@ -27,7 +27,7 @@
  *	\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formorder.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php");

htdocs/commande/index.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/notify.class.php");
 

htdocs/commande/info.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");

htdocs/commande/liste.php

@@ -27,7 +27,7 @@
  */
 
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
 $langs->load('orders');

htdocs/commande/note.php

@@ -25,7 +25,7 @@
  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
 
 $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
 	}
 	print "</td></tr>";
 
-	// Note privée
+	// Note priv<EFBFBD>e
 	if (! $user->societe_id)
 	{
 		print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';

htdocs/commande/pre.inc.php

@@ -1,52 +0,0 @@
-<?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-        \file       htdocs/commande/pre.inc.php
-        \ingroup    commandes
-        \brief      Gestionnaire du menu commandes
-        \version    $Id$
-*/
-
-require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
-
-$langs->load("orders");
-
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-	global $user, $conf, $langs;
-
-	top_menu($head, $title);
-
-	$menu = new Menu();
-
-	$menu->add(DOL_URL_ROOT."/commande/", $langs->trans("Orders"));
-	$menu->add_submenu(DOL_URL_ROOT."/commande/liste.php", $langs->trans("List"));
-	$menu->add_submenu(DOL_URL_ROOT."/commande/stats/", $langs->trans("Statistics"));
-
-	if ($conf->expedition->enabled && $user->rights->expedition->lire)
-	{
-		$menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings"));
-	}
-
-	left_menu($menu->liste, $help_url);
-}
-?>

htdocs/commande/stats/index.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");

htdocs/commande/stats/month.php

@@ -24,7 +24,7 @@
  *		\brief      Page des stats commandes par mois
  *		\version    $Id$
  */
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");

htdocs/commande/stats/pre.inc.php

@@ -1,51 +0,0 @@
-<?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-		\file       htdocs/commande/stats/pre.inc.php
-		\ingroup    commandes
-		\brief      Gestionnaire du menu commandes
-		\version    $Id$
-*/
-
-require("../../main.inc.php");
-
-$langs->load("orders");
-
-
-function llxHeader($head = "", $title="", $help_url='')
-{
-	global $user, $conf, $langs;
-
-	top_menu($head, $title);
-
-	$menu = new Menu();
-
-	$menu->add(DOL_URL_ROOT."/commande/", $langs->trans("Orders"));
-	$menu->add_submenu(DOL_URL_ROOT."/commande/liste.php", $langs->trans("List"));
-	$menu->add_submenu(DOL_URL_ROOT."/commande/stats/", $langs->trans("Statistics"));
-
-	if ($conf->expedition->enabled)
-	{
-		$menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings"));
-	}
-
-	left_menu($menu->liste, $help_url);
-}
-?>

htdocs/compta/charges/index.php

@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

htdocs/compta/charges/pre.inc.php

@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**

htdocs/compta/commande/fiche.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");

htdocs/compta/commande/liste.php

@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -28,7 +27,7 @@
  *       \version    $Revision$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
 $langs->load('companies');

htdocs/compta/commande/pre.inc.php

@@ -1,139 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- */
-
-/**
-      \file   	    htdocs/compta/commande/pre.inc.php
-      \ingroup      compta,commande
-      \brief  	    Fichier gestionnaire du menu commande de compta
-*/
-
-require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
-
-$langs->load("orders");
-
-
-function llxHeader($head = "", $title="", $help_url='')
-{
-    global $user, $conf, $langs;
-
-    top_menu($head, $title);
-
-    $menu = new Menu();
-
-    // Les recettes
-
-    $langs->load("commercial");
-    $menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers"));
-
-    if ($conf->propal->enabled)
-    {
-        $langs->load("propal");
-        $menu->add(DOL_URL_ROOT."/compta/propal.php",$langs->trans("Prop"));
-    }
-
-    if ($conf->contrat->enabled)
-    {
-        $langs->load("contracts");
-        $menu->add(DOL_URL_ROOT."/contrat/",$langs->trans("Contracts"));
-    }
-
-    if ($conf->don->enabled)
-    {
-        $langs->load("donations");
-        $menu->add(DOL_URL_ROOT."/compta/dons/",$langs->trans("Donations"));
-    }
-
-    if ($conf->facture->enabled)
-    {
-        $langs->load("bills");
-        $menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
-        $menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpaid"));
-        $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php",$langs->trans("Payments"));
-        $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php", $langs->trans("Repeatable"));
-
-        $menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"));
-    }
-
-
-    if ($conf->commande->enabled && $conf->facture->enabled)
-    {
-        $langs->load("orders");
-        $menu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&afacturer=1", $langs->trans("MenuOrdersToBill"));
-    }
-
-
-    // Les d<>penses
-    if ($conf->fournisseur->enabled)
-    {
-        $langs->load("suppliers");
-        $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
-    }
-
-    if ($conf->deplacement->enabled && $user->societe_id == 0)
-    {
-        $menu->add(DOL_URL_ROOT."/compta/deplacement/", "D<EFBFBD>placement");
-    }
-
-    if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0)
-    {
-        $menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT"));
-    }
-
-    if ($conf->tax->enabled)
-    {
-        $menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges"));
-    }
-
-
-    // Vision des recettes-d<>penses
-    if ($conf->banque->enabled && $user->rights->banque->lire)
-    {
-        $langs->load("banks");
-        $menu->add(DOL_URL_ROOT."/compta/bank/",$langs->trans("Bank"));
-    }
-
-    $menu->add(DOL_URL_ROOT."/compta/stats/",$langs->trans("Reportings"));
-
-    if ($conf->prelevement->enabled)
-    {
-        $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
-    }
-
-    if ($conf->compta->enabled)
-    {
-    	if ($user->rights->compta->ventilation->creer)
-		{
-	    	$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
-		}
-
-	    if ($user->rights->compta->ventilation->parametrer)
-	    {
-	        $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
-	    }
-	}
-
-
-    left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/compta/deplacement/fiche.php

@@ -23,7 +23,7 @@
  *  \brief      	Page to show a trip card
  *  \version		$Id$
  */
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 if ($conf->projet->enabled)
 {

htdocs/compta/deplacement/index.php

@@ -25,7 +25,7 @@
 		\version	$Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
 
 $langs->load("companies");

htdocs/compta/deplacement/note.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/deplacement.class.php");
 
 $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";

htdocs/compta/deplacement/pre.inc.php

@@ -1,50 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- *
- */
-
-/**
- *     \file   	    htdocs/compta/deplacement/pre.inc.php
- *     \ingroup      deplacement
- *     \brief  	    Fichier gestionnaire du menu deplacement
- */
-
-require("../../main.inc.php");
-require("./deplacement.class.php");
-
-$deplacement_type[0] = "voiture";
-//$deplacement_type[1] = "train";
-//$deplacement_type[2] = "avion";
-
-function llxHeader($head = "") {
-  global $user, $conf, $langs;
-
-  top_menu($head);
-
-  $menu = new Menu();
-
-  $menu->add("index.php",$langs->trans("Trips"));
-  $menu->add_submenu("fiche.php?action=create",$langs->trans("NewTrip"));
-
-  left_menu($menu->liste);
-}
-
-?>

htdocs/compta/dons/fiche.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/dons/don.class.php");

htdocs/compta/dons/index.php

@@ -24,7 +24,7 @@
 		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/dons/don.class.php");
 
 $langs->load("donations");

htdocs/compta/dons/liste.php

@@ -24,7 +24,7 @@
 		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/dons/don.class.php");
 
 $langs->load("companies");

htdocs/compta/dons/pre.inc.php

@@ -1,65 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- */
-
-/**
-	    \file       htdocs/compta/dons/pre.inc.php
-        \ingroup    don
-		\brief      Fichier gestionnaire du menu de gauche de l'espace dons
-		\version    $Revision$
-*/
-
-require("../../main.inc.php");
-
-$langs->load("donations");
-$langs->load("propal");
-
-$libelle[0] = $langs->trans("PromisesNotValid");
-$libelle[1] = $langs->trans("PromisesValid");
-$libelle[2] = $langs->trans("DonationsPaid");
-$libelle[3] = $langs->trans("DonationsReceived");
-
-
-function llxHeader($head = "", $title="", $help_url="")
-{
-	global $user, $conf, $langs;
-
-	$langs->load("donations");
-
-	top_menu($head,$title);
-
-	$menu = new Menu();
-
-	$menu->add(DOL_URL_ROOT."/compta/dons/",$langs->trans("Donations"));
-	$menu->add_submenu(DOL_URL_ROOT."/compta/dons/fiche.php?action=create",$langs->trans("NewDonation"));
-	$menu->add_submenu(DOL_URL_ROOT."/compta/dons/liste.php",$langs->trans("List"));
-	$menu->add_submenu(DOL_URL_ROOT."/compta/dons/stats.php",$langs->trans("Statistics"));
-
-	if ($conf->banque->enabled)
-	{
-		$langs->load("banks");
-		$menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("Bank"));
-	}
-
-	left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/compta/dons/stats.php

@@ -24,7 +24,7 @@
 		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("donations");
 

htdocs/compta/export/index.php

@@ -27,7 +27,7 @@
 		\version    $Revision$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once("./ComptaJournalPaiement.class.php");
 require_once("./ComptaJournalVente.class.php");
 

htdocs/compta/export/liste.php

@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -26,14 +25,14 @@
 		\version    $Revision$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("compta");
 
 $dir = $conf->compta->dir_output."/export/";
 
 
-// Sécurité accés client
+// Security check
 if ($user->societe_id > 0)
 {
   $action = '';

htdocs/compta/export/pre.inc.php

@@ -1,64 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> 
- * Copyright (C) 2004-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- *
- */
-
-/*!
-  \file       htdocs/compta/export/pre.inc.php
-  \ingroup    compta
-  \brief      Fichier gestionnaire du menu export compta
-*/
-
-require("../../main.inc.php");
-
-function llxHeader($head = "", $title="", $help_url='')
-{
-  global $user, $conf, $langs;
-
-  top_menu($head, $title);
-
-  $menu = new Menu();
-
-  // Les recettes
-
-  $langs->load("bills");
-
-  $menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers"));
-
-  if (!$user->rights->compta->ventilation->creer)
-    {
-      $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
-    }
-      
-  $menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
-
-  $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
-
-  $menu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export"));
-
-  $menu->add_submenu(DOL_URL_ROOT."/compta/export/index.php?action=export",$langs->trans("New"));
-
-  $menu->add_submenu(DOL_URL_ROOT."/compta/export/liste.php",$langs->trans("List"));
-
-  left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/compta/facture/apercu.php

@@ -23,11 +23,11 @@
 /**
 	    \file       htdocs/compta/facture/apercu.php
 		\ingroup    facture
-		\brief      Page de l'onglet aper<EFBFBD>u d'une facture
+		\brief      Page de l'onglet apercu d'une facture
 		\version    $Revision$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");

htdocs/compta/facture/contact.php

@@ -24,7 +24,7 @@
  *       \version    $Id$
  */
 
-require ("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/discount.class.php');

htdocs/compta/facture/document.php

@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/discount.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php");

htdocs/compta/facture/fiche-rec.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once("./facture-rec.class.php");
 require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");

htdocs/compta/facture/impayees.php

@@ -26,7 +26,7 @@
  *		\version    $Revision$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");

htdocs/compta/facture/info.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/discount.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");

htdocs/compta/facture/note.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/discount.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');

htdocs/compta/facture/pre.inc.php

@@ -1,60 +0,0 @@
-<?php
-/* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> 
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- *
- */
-
-/**
-   \file         htdocs/compta/facture/pre.inc.php
-   \ingroup      facture
-   \brief        Fichier de gestion du menu gauche du module facture
-   \version      $Revision$
-*/
-
-require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
-
-$langs->load('bills');
-
-function llxHeader($head = "", $title="", $help_url='') {
-    global $user, $conf, $langs;
-
-    $langs->load("companies");
-    $langs->load("commercial");
-    $langs->load("bills");
-    $langs->load("banks");
-    $langs->load("propal");
-    
-    top_menu($head, $title);
-    
-    $menu = new Menu();
-    
-    $menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers"));
-    
-    $langs->load("bills");
-    $menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
-    $menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpaid"));
-    
-    $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
-    
-    left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/compta/facture/prelevement.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      <EFBFBD>ric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
 
@@ -36,7 +36,7 @@ $langs->load("bills");
 $langs->load("banks");
 $langs->load("withdrawals");
 
-// S<EFBFBD>curit<EFBFBD> acc<63>s client
+// Security check
 if ($user->societe_id > 0)
 {
 	$action = '';

htdocs/compta/facture/stats/index.php

@@ -24,7 +24,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
 
 $WIDTH=500;

htdocs/compta/facture/stats/month.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
 
 $GRAPHWIDTH=500;

htdocs/compta/facture/stats/pre.inc.php

@@ -1,50 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- *
- */
-
-/**
-        \file         htdocs/compta/facture/stats/pre.inc.php
-        \ingroup      facture
-        \brief        Fichier de gestion du menu gauche des stats facture
-        \version      $Revision$
-*/
-
-require("../../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/compta/facture/stats/facturestats.class.php");
-
-
-function llxHeader($head = "", $urlp = "")
-{
-  global $langs;
-  $langs->load("bills");
-  $langs->load("propal");
-  
-  top_menu($head);
-
-  $menu = new Menu();
-
-  $menu->add(DOL_URL_ROOT."/compta/facture.php", $langs->trans("Bills"));
-
-  $menu->add("index.php", $langs->trans("Statistics"));
-
-  left_menu($menu->liste);
-}
-?>

htdocs/compta/paiement/avalider.php

@@ -24,11 +24,11 @@
         \version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("bills");
 
-// Sécurité accés client
+// Security check
 if (! $user->rights->facture->lire)
   accessforbidden();
 

htdocs/compta/paiement/fiche.php

@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php');
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");

htdocs/compta/paiement/index.php

@@ -16,10 +16,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
- *
  */
-require("./pre.inc.php");
+
+require("../../main.inc.php");
 
 // Security check
 if (!$user->admin && $user->societe_id > 0)

htdocs/compta/paiement/info.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
 

htdocs/compta/paiement/liste.php

@@ -25,7 +25,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php');
 
@@ -91,7 +91,7 @@ if ($_GET["search_montant"])
 
 if ($_GET["orphelins"])     // Option for debugging purpose only
 {
-  // Paiements liés à aucune facture (pour aide au diagnostic)
+  // Paiements li<EFBFBD>s <20> aucune facture (pour aide au diagnostic)
   $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount,";
   $sql.= " p.statut, p.num_paiement,";
   //$sql.= " c.libelle as paiement_type";

htdocs/compta/paiement/pre.inc.php

@@ -1,60 +0,0 @@
-<?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
- *	\file   	    htdocs/compta/paiement/pre.inc.php
- *	\ingroup      	compta
- *	\brief  	    Fichier gestionnaire du menu compta paiement
- *	\version		$Id$ 
- */
-
-require("../../main.inc.php");
-
-$langs->load("bills");
-$langs->load("compta");
-$langs->load("propal");
-
-function llxHeader($head = "", $title="")
-{
-
-	global $conf, $user, $langs;
-
-	$langs->load("bills");
-
-	top_menu($head, $title);
-
-	$menu = new Menu();
-
-	$menu->add("liste.php",$langs->trans("Payments"));
-	$menu->add_submenu("liste.php",$langs->trans("List"));
-
-	$menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("MenuChequeDeposits"));
-
-	$menu->add("rapport.php",$langs->trans("Reportings"));
-
-	$menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
-	$menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpaid"));
-
-	if ($conf->global->BILL_ADD_PAYMENT_VALIDATION)
-	{
-		$menu->add_submenu("avalider.php",$langs->trans("MenuToValid"));
-	}
-	left_menu($menu->liste);
-}
-?>

htdocs/compta/paiement/rapport.php

@@ -24,7 +24,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 

htdocs/compta/param/comptes/fiche.php

@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 
@@ -28,7 +27,7 @@
         \version    $Revision$
 */
 
-require("./pre.inc.php");
+require("../../../main.inc.php");
 
 $mesg = '';
 
@@ -67,7 +66,7 @@ if ($_POST["action"] == 'add' && $user->rights->compta->ventilation->parametrer)
 llxHeader("","Nouveau compte");
 
 /*
- * Création d'un compte
+ * Cr<EFBFBD>ation d'un compte
  *
  */
 if ($_GET["action"] == 'create' && $user->rights->compta->ventilation->parametrer)
@@ -87,7 +86,7 @@ if ($_GET["action"] == 'create' && $user->rights->compta->ventilation->parametre
     print '<td>'.$langs->trans("AccountNumber").'</td><td><input name="numero" size="20" value="'.$compte->numero.'">';
     if ($_error == 1)
     {
-        print "Ce numéro de compte existe déjà";
+        print "Ce num<EFBFBD>ro de compte existe d<>j<EFBFBD>";
     }
     if ($_error == 2)
     {

htdocs/compta/param/comptes/index.php

@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -27,13 +26,13 @@
 		\version    $Revision$
 */
 
-require("./pre.inc.php");
+require("../../../main.inc.php");
 
 $langs->load("compta");
 $langs->load("bills");
 
 /*
- * Sécurité accés client
+ * S<EFBFBD>curit<EFBFBD> acc<EFBFBD>s client
  */
 if ($user->societe_id > 0)
 {

htdocs/compta/param/comptes/liste.php

@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -26,7 +25,8 @@
         \brief      Onglet de gestion de parametrages des ventilations
         \version    $Revision$
 */
-require("./pre.inc.php");
+
+require("../../../main.inc.php");
 
 
 llxHeader('','Compta - Liste des comptes');
@@ -78,7 +78,7 @@ if ($resql)
   $num = $db->num_rows($resql);
   $i = 0;
 
-  print_barre_liste("Comptes généraux", $page, "liste.php", "", $sortfield, $sortorder, '', $num);
+  print_barre_liste("Comptes g<EFBFBD>n<EFBFBD>raux", $page, "liste.php", "", $sortfield, $sortorder, '', $num);
 
   print '<table class="liste">';
   print '<tr class="liste_titre">';

htdocs/compta/param/comptes/pre.inc.php

@@ -1,48 +0,0 @@
-<?php
-/* Copyright (C) 2001-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- */
-
-/**     \file   	htdocs/compta/param/comptes/pre.inc.php
-        \ingroup    compta
-        \brief  	Fichier gestionnaire du menu paramétrage de la compta
-*/
-
-require("../../../main.inc.php");
-require_once DOL_DOCUMENT_ROOT.'/compta/comptacompte.class.php';
-
-function llxHeader($head = "", $title="", $help_url='')
-{
-  global $user, $langs;
-    
-  top_menu($head, $title);
-
-  $menu = new Menu();
-
-  $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
-
-  $menu->add(DOL_URL_ROOT."/compta/param/comptes/",$langs->trans("AccountsGeneral"));
-  $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php",$langs->trans("List"));
-  $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/fiche.php?action=create",$langs->trans("New"));
-
-  left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/compta/param/index.php

@@ -20,17 +20,17 @@
 /**
         \file       htdocs/compta/param/index.php
         \ingroup    compta
-		\brief      Page acceuil zone paramétrage comptabilité
+		\brief      Page acceuil zone parametrage comptabilite
 		\version    $Id$
 */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("compta");
 $langs->load("bills");
 
 /*
- * Sécurité accés client
+ * S<EFBFBD>curit<EFBFBD> acc<EFBFBD>s client
  */
 if ($user->societe_id > 0)
 {

htdocs/compta/param/pre.inc.php

@@ -1,46 +0,0 @@
-<?php
-/* Copyright (C) 2004-2005 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- */
-
-/**
-        \file   	htdocs/compta/param/pre.inc.php
-        \ingroup    compta
-        \brief  	Fichier gestionnaire du menu paramétrage de la compta
-*/
-
-require("../../main.inc.php");
-
-function llxHeader($head = "", $title="", $help_url='')
-{
-  global $langs;
-   
-  top_menu($head, $title);
-
-  $menu = new Menu();
-
-  $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
-
-  $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php",$langs->trans("AccountsGeneral"));
-
-  left_menu($menu->liste, $help_url);
-}
-
-?>