diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 2e54ac4f9fa..b89142e9860 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -39,7 +39,7 @@
*/
require("./pre.inc.php");
-require (DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
$langs->load("admin");
diff --git a/htdocs/domain/pre.inc.php b/htdocs/domain/pre.inc.php
index 2c627302610..f1cd8be467a 100644
--- a/htdocs/domain/pre.inc.php
+++ b/htdocs/domain/pre.inc.php
@@ -17,10 +17,9 @@
* 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.
- *
*/
-require ("../main.inc.php");
+require_once("../main.inc.php");
function llxHeader($head = "") {
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 3b38f584083..b8334bc711e 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -473,17 +473,19 @@ else
}
else
{
+
/*
*
*/
$h=0;
$head[$h][0] = "fiche.php?facid=".$fac->id;
- $head[$h][1] = $langs->trans("SupplierBill").': '.$fac->ref;
+ $head[$h][1] = $langs->trans("Card");
$hselected = $h;
$h++;
- dolibarr_fiche_head($head, $hselected);
+ $titre=$langs->trans("SupplierBill").': '.$fac->ref;
+ dolibarr_fiche_head($head, $hselected, $titre);
/*
@@ -524,9 +526,9 @@ else
print "
| ".$langs->trans("Author")." | $authorfullname | ";
print '
| '.$langs->trans("Status").' | '.$fac->LibStatut($fac->paye,$fac->statut)." |
";
- print '| '.$langs->trans("TotalHT").' | '.price($fac->total_ht)." | ";
- print ''.$langs->trans("VAT").' | '.price($fac->total_tva)." |
";
- print '| '.$langs->trans("TotalTTC").' | '.price($fac->total_ttc)." |
";
+ print '| '.$langs->trans("AmountHT").' | '.price($fac->total_ht).' | '.$langs->trans("Currency".$conf->monnaie).' |
';
+ print '| '.$langs->trans("AmountVAT").' | '.price($fac->total_tva).' | '.$langs->trans("Currency".$conf->monnaie).' |
';
+ print '| '.$langs->trans("AmountTTC").' | '.price($fac->total_ttc).' | '.$langs->trans("Currency".$conf->monnaie).' |
';
if (strlen($fac->note))
{
print '| '.$langs->trans("Comments").' | ';
@@ -580,7 +582,7 @@ else
$objp = $db->fetch_object($result);
$var=!$var;
print " |
";
- print "| ".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)." | \n";
+ print ''.img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)." | \n";
print "$objp->paiement_type $objp->num_paiement | \n";
print "".price($objp->amount)." | ".$langs->trans("Currency".$conf->monnaie)." | \n";
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 0c3a6eee876..527b00091fe 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -56,17 +56,17 @@ if (file_exists($conffile))
if($dolibarr_main_db_type == "mysql")
{
- require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
$choix=1;
}
else
{
- require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
- require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
+ require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/grant.postgres.php");
$choix=2;
}
-require ($dolibarr_main_document_root . "/conf/conf.class.php");
+require_once($dolibarr_main_document_root . "/conf/conf.class.php");
if ($_POST["action"] == "set")
diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php
index 1e9423d4345..a9bcbff1694 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/etape4.php
@@ -45,13 +45,13 @@ if (file_exists($conffile))
}
if($dolibarr_main_db_type == "mysql")
- require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
else
- require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
-require ($dolibarr_main_document_root . "/conf/conf.class.php");
+require_once($dolibarr_main_document_root . "/conf/conf.class.php");
print '';
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index e9ce5ce226e..f5c168ba548 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -44,11 +44,11 @@ if (file_exists($conffile))
if($dolibarr_main_db_type == "mysql")
- require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
else
- require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
-require ($dolibarr_main_document_root . "/conf/conf.class.php");
+require_once($dolibarr_main_document_root . "/conf/conf.class.php");
if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 56ad5714bef..cde66a09aa3 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -56,17 +56,17 @@ if (file_exists($conffile))
if($dolibarr_main_db_type == "mysql")
{
- require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
$choix=1;
}
else
{
- require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
- require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
+ require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
+ require_once($dolibarr_main_document_root . "/lib/grant.postgres.php");
$choix=2;
}
-require ($dolibarr_main_document_root . "/conf/conf.class.php");
+require_once($dolibarr_main_document_root . "/conf/conf.class.php");
if (isset($_GET["action"]) && $_GET["action"] == "upgrade")
diff --git a/htdocs/public/dons/bplc.php b/htdocs/public/dons/bplc.php
index 00dee8ce525..baadfdfeba4 100644
--- a/htdocs/public/dons/bplc.php
+++ b/htdocs/public/dons/bplc.php
@@ -42,7 +42,7 @@ $conf->db->pass = $dolibarr_main_db_pass;
// travail avec mysql
if (! $conf->db->type) { $conf->db->type = 'mysql'; }
-require (DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
+require_once(DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
diff --git a/scripts/banque/graph-solde.php b/scripts/banque/graph-solde.php
index 15ce8672fd1..896e3deb4fd 100644
--- a/scripts/banque/graph-solde.php
+++ b/scripts/banque/graph-solde.php
@@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
$path=eregi_replace('graph-solde.php','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+require_once($path."../../htdocs/master.inc.php");
// Vérifie que chemin vers JPGRAHP est connu et defini $jpgraph
if (! defined('JPGRAPH_DIR') && ! defined('JPGRAPH_PATH'))
@@ -51,12 +51,12 @@ $jpgraphdir=JPGRAPH_DIR;
if (! eregi('[\\\/]$',$jpgraphdir)) $jpgraphdir.='/';
-include_once ($jpgraphdir."jpgraph.php");
-include_once ($jpgraphdir."jpgraph_line.php");
-include_once ($jpgraphdir."jpgraph_bar.php");
-include_once ($jpgraphdir."jpgraph_pie.php");
-include_once ($jpgraphdir."jpgraph_error.php");
-include_once ($jpgraphdir."jpgraph_canvas.php");
+include_once($jpgraphdir."jpgraph.php");
+include_once($jpgraphdir."jpgraph_line.php");
+include_once($jpgraphdir."jpgraph_bar.php");
+include_once($jpgraphdir."jpgraph_pie.php");
+include_once($jpgraphdir."jpgraph_error.php");
+include_once($jpgraphdir."jpgraph_canvas.php");
$error = 0;
diff --git a/scripts/dump.php b/scripts/dump.php
index de1f0a0fecd..df029166ece 100644
--- a/scripts/dump.php
+++ b/scripts/dump.php
@@ -17,10 +17,9 @@
*
* $Id$
* $Source$
- *
- *
*/
-require ("../htdocs/master.inc.php");
+
+require_once("../htdocs/master.inc.php");
$fname = '/tmp/dump.sh';
diff --git a/scripts/energie/graph-line.php b/scripts/energie/graph-line.php
index 0cbd870f1ce..4bee76d3100 100644
--- a/scripts/energie/graph-line.php
+++ b/scripts/energie/graph-line.php
@@ -20,13 +20,13 @@
*
*/
-require ("../../htdocs/master.inc.php");
+require_once("../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieCompteur.class.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieGroupe.class.php");
-include_once (JPGRAPH_DIR."jpgraph.php");
-include_once (JPGRAPH_DIR."jpgraph_line.php");
+include_once(JPGRAPH_DIR."jpgraph.php");
+include_once(JPGRAPH_DIR."jpgraph_line.php");
$error = 0;
diff --git a/scripts/energie/graph.php b/scripts/energie/graph.php
index 348ba78ab8c..3f1387f79d9 100644
--- a/scripts/energie/graph.php
+++ b/scripts/energie/graph.php
@@ -17,20 +17,19 @@
*
* $Id$
* $Source$
- *
*/
-require ("../../htdocs/master.inc.php");
+require_once("../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieCompteur.class.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieGroupe.class.php");
-include_once (JPGRAPH_DIR."jpgraph.php");
-include_once (JPGRAPH_DIR."jpgraph_line.php");
-include_once (JPGRAPH_DIR."jpgraph_bar.php");
-include_once (JPGRAPH_DIR."jpgraph_pie.php");
-include_once (JPGRAPH_DIR."jpgraph_error.php");
-include_once (JPGRAPH_DIR."jpgraph_canvas.php");
+include_once(JPGRAPH_DIR."jpgraph.php");
+include_once(JPGRAPH_DIR."jpgraph_line.php");
+include_once(JPGRAPH_DIR."jpgraph_bar.php");
+include_once(JPGRAPH_DIR."jpgraph_pie.php");
+include_once(JPGRAPH_DIR."jpgraph_error.php");
+include_once(JPGRAPH_DIR."jpgraph_canvas.php");
$error = 0;
diff --git a/scripts/export-mailing.php b/scripts/export-mailing.php
index f63b1e092d2..9e8c2187cc4 100644
--- a/scripts/export-mailing.php
+++ b/scripts/export-mailing.php
@@ -20,13 +20,11 @@
*
*
* Export simple des contacts
- *
*/
-require ("../htdocs/master.inc.php");
-
-require_once (DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php");
-require_once (DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php");
+require_once("../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php");
$error = 0;
diff --git a/scripts/ldap-update-allcontact.php b/scripts/ldap-update-allcontact.php
index db4163fff81..7cc452046c2 100644
--- a/scripts/ldap-update-allcontact.php
+++ b/scripts/ldap-update-allcontact.php
@@ -21,9 +21,9 @@
* Mets à jour tous les contacts dans LDAP à partir de la base sql
*/
-require ("../htdocs/master.inc.php");
-require_once (DOL_DOCUMENT_ROOT."/contact.class.php");
-require_once (DOL_DOCUMENT_ROOT."/user.class.php");
+require_once("../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user.class.php");
$error = 0;
diff --git a/scripts/lolix/candidat-desactive.php b/scripts/lolix/candidat-desactive.php
index ad7019e7044..5d6d8f1b159 100644
--- a/scripts/lolix/candidat-desactive.php
+++ b/scripts/lolix/candidat-desactive.php
@@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi')
exit;
}
-require ("../../htdocs/master.inc.php");
-require(DOL_DOCUMENT_ROOT."/lolix/cv/cv.class.php");
+require_once("../../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lolix/cv/cv.class.php");
$error = 0;
diff --git a/scripts/mailing-prepare.php b/scripts/mailing-prepare.php
index 97b250ad8c4..341a7413e56 100644
--- a/scripts/mailing-prepare.php
+++ b/scripts/mailing-prepare.php
@@ -42,7 +42,7 @@
\brief Script pour préparer les destinataires d'un mailing
*/
-require ("../htdocs/master.inc.php");
+require_once("../htdocs/master.inc.php");
$error = 0;
@@ -62,7 +62,7 @@ if ( $db->query($sql) )
dolibarr_syslog("mailing-prepare: mailing $row[0]");
dolibarr_syslog("mailing-prepare: mailing module $row[1]");
- require DOL_DOCUMENT_ROOT.'/includes/modules/mailings/'.$row[1].'.modules.php';
+ require_once(DOL_DOCUMENT_ROOT.'/includes/modules/mailings/'.$row[1].'.modules.php');
$classname = "mailing_".$row[1];
diff --git a/scripts/prelevement-verif.php b/scripts/prelevement-verif.php
index 943a2e69cb9..7ed2840e481 100644
--- a/scripts/prelevement-verif.php
+++ b/scripts/prelevement-verif.php
@@ -23,12 +23,11 @@
* Script de verification des demandes de prélèvement
*
* Vérifie que les sociétés qui doivent être prélevées ont bien un RIB correct
- *
*/
-require ("../htdocs/master.inc.php");
-
-require_once (DOL_DOCUMENT_ROOT."/facture.class.php");
-require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
+
+require_once("../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
$error = 0;
diff --git a/scripts/prelevement.php b/scripts/prelevement.php
index f6df4d3a82c..6aa3d5d92f2 100644
--- a/scripts/prelevement.php
+++ b/scripts/prelevement.php
@@ -19,17 +19,14 @@
* $Id$
* $Source$
*
- *
* Script de prelevement
- *
*/
-require ("../htdocs/master.inc.php");
-
-require_once (DOL_DOCUMENT_ROOT."/bon-prelevement.class.php");
-require_once (DOL_DOCUMENT_ROOT."/facture.class.php");
-require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
-require_once (DOL_DOCUMENT_ROOT."/paiement.class.php");
+require_once("../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/bon-prelevement.class.php");
+require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
$error = 0;