diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 2e54ac4f9fa0e3ff728e6a9f1ad9959ffa0ce473..b89142e98609617aee843937f527d6e54537bcc6 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 2c627302610f14df42a27a16168d56e69234fa8c..f1cd8be467a47dbb4d1ab26a559db194de154894 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 3b38f584083bfa3b57a1bd6a9ed270425e2be762..b8334bc711e2d810920e105cf9e5e8251e8e8c13 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 "<tr><td>".$langs->trans("Author")."</td><td colspan=\"3\">$authorfullname</td>";
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$fac->LibStatut($fac->paye,$fac->statut)."</td></tr>";
- print '<tr><td>'.$langs->trans("TotalHT").'</td><td align="center"><b>'.price($fac->total_ht)."</b></td>";
- print '<td align="right">'.$langs->trans("VAT").'</td><td align="center">'.price($fac->total_tva)."</td></tr>";
- print '<tr><td>'.$langs->trans("TotalTTC").'</td><td colspan="3" align="center">'.price($fac->total_ttc)."</td></tr>";
+ print '<tr><td>'.$langs->trans("AmountHT").'</td><td><b>'.price($fac->total_ht).'</b></td><td colspan="2" align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
+ print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($fac->total_tva).'</td><td colspan="2" align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
+ print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($fac->total_ttc).'</td><td colspan="2" align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if (strlen($fac->note))
{
print '<tr><td>'.$langs->trans("Comments").'</td><td colspan="3">';
@@ -580,7 +582,7 @@ else
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
- print "<td nowrap>".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)."</td>\n";
+ print '<td nowrap><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").'</a> '.dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print "<td align=\"right\">".price($objp->amount)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td>\n";
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 0c3a6eee8766b43caa9f042e19697a22cb6279b5..527b00091fe96544d9e79968d7cc610e1577b595 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 1e9423d434514b0c9b5e8d6463b89aa2859b573d..a9bcbff1694f29ccff6dd9e09d4bae4e7aa144cd 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 '<table cellspacing="0" cellpadding="2" width="100%">';
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index e9ce5ce226ed13b272a2faa34a469aea502a18a9..f5c168ba5481c9cdfb3f46315bed3e0e1fd68c5b 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 56ad5714bef7f561d21cff99205e54a009398156..cde66a09aa3a92a90bfd2f0ba37cf42fc7b2de57 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 00dee8ce5253de57ae4746c9818e04656beace90..baadfdfeba461c7f4033347b2278ecf180aed9b7 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 15ce8672fd117d02af41049d7e4a157ab464eb4d..896e3deb4fd2f79165739cef489ee68818ee1380 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 de1f0a0fecd83d9620a126f2431a839603d1fca9..df029166eced50e944efb784b81ded72b3e0cc69 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 0cbd870f1ceecb6bd137ac92d54c49822c9f4d40..4bee76d3100e1769d36bf8ce44331f8a897d98a3 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 348ba78ab8ca5046e034da8acb9bc7077ea4c233..3f1387f79d985367676a5a5c8824bfbaa1459ff3 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 f63b1e092d261c78e19191fe8dd273b82db12f35..9e8c2187cc429961c2a5d741596ccd4cbb9e1de7 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 db4163fff81e2e6a06d50c885177a8295f8d2617..7cc452046c22626b9801275efa441700fb0aa44a 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 ad7019e7044a8e450aa92576cdfdda103b785d3c..5d6d8f1b159bfce6bef5a4b8d6606738c0e039e2 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 97b250ad8c4e444892be3dc59009c22291773aeb..341a7413e56be55347e12b6d8b50e658921611ff 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 943a2e69cb96ed5281d08a5e2f4045baa78f60b0..7ed2840e481ea1f02cca962a66581ba9d2420af5 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 f6df4d3a82c44a24db246d28daff12aa8704b00f..6aa3d5d92f2a059c892b8e5086321221eba4e86c 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;