diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 2ca544d826c..c330e371240 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -30,7 +30,7 @@ if ($user->societe_id > 0)
$socidp = $user->societe_id;
}
-llxHeader();
+llxHeader("","Accueil Compta");
/*
*
@@ -111,6 +111,39 @@ if ($user->comm > 0 && $conf->commercial )
}
}
}
+/*
+ * Factures brouillons
+ */
+
+$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM llx_facture as f, llx_societe as s WHERE s.idp = f.fk_soc AND f.fk_statut = 0";
+
+if ( $db->query($sql) )
+{
+ $num = $db->num_rows();
+ $i = 0;
+
+ if ($num)
+ {
+ print '
';
+ print '';
+ print '| Factures brouillons |
';
+
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object( $i);
+ $var=!$var;
+ print '| '.$obj->facnumber.' | ';
+ print ''.$obj->nom.' |
';
+ $i++;
+ }
+
+ print "
";
+ }
+}
+else
+{
+ print $sql;
+}
/*
* Charges a payer
@@ -152,43 +185,6 @@ if ($user->societe_id == 0)
print $db->error();
}
}
-/*
- * Factures impayées
- */
-
-$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM llx_facture as f, llx_societe as s WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut > 0";
-if ($socidp)
-{
- $sql .= " AND f.fk_soc = $socidp";
-}
-
-if ( $db->query($sql) )
-{
- $num = $db->num_rows();
- $i = 0;
-
- if ($num)
- {
- print '';
- print "";
- print '| Factures impayées |
';
-
- while ($i < $num)
- {
- $obj = $db->fetch_object( $i);
- $var=!$var;
- print '| '.$obj->facnumber.' | ';
- print ''.$obj->nom.' |
';
- $i++;
- }
- print "
";
- }
- $db->free();
-}
-else
-{
- print $sql;
-}
/*
* Bookmark
@@ -241,6 +237,44 @@ if ($user->societe_id == 0)
print '
';
+/*
+ * Factures impayées
+ */
+
+$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM llx_facture as f, llx_societe as s WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut > 0";
+if ($socidp)
+{
+ $sql .= " AND f.fk_soc = $socidp";
+}
+
+if ( $db->query($sql) )
+{
+ $num = $db->num_rows();
+ $i = 0;
+
+ if ($num)
+ {
+ print '';
+ print "";
+ print '| Factures impayées |
';
+
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object( $i);
+ $var=!$var;
+ print '| '.$obj->facnumber.' | ';
+ print ''.$obj->nom.' |
';
+ $i++;
+ }
+ print "
";
+ }
+ $db->free();
+}
+else
+{
+ print $sql;
+}
+
$result = 0;
if ( $result ) {
@@ -268,39 +302,6 @@ if ( $result ) {
*
*/
-/*
- * Factures brouillons
- */
-
-$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM llx_facture as f, llx_societe as s WHERE s.idp = f.fk_soc AND f.fk_statut = 0";
-
-if ( $db->query($sql) )
-{
- $num = $db->num_rows();
- $i = 0;
-
- if ($num)
- {
- print '';
- print '';
- print '| Factures brouillons |
';
-
- while ($i < $num)
- {
- $obj = $db->fetch_object( $i);
- $var=!$var;
- print '| '.$obj->facnumber.' | ';
- print ''.$obj->nom.' |
';
- $i++;
- }
-
- print "
";
- }
-}
-else
-{
- print $sql;
-}
/*
* Factures a payer
diff --git a/htdocs/compta/pre.inc.php3 b/htdocs/compta/pre.inc.php3
index 99b85b2b1fb..c18d44d034f 100644
--- a/htdocs/compta/pre.inc.php3
+++ b/htdocs/compta/pre.inc.php3
@@ -21,15 +21,14 @@
*/
require("../main.inc.php3");
-function llxHeader($head = "") {
+function llxHeader($head = "", $title="") {
global $user, $conf;
-
/*
*
*
*/
- top_menu($head);
+ top_menu($head, $title);
$menu = new Menu();
diff --git a/htdocs/product/fiche.php3 b/htdocs/product/fiche.php3
index c45e587a183..37f3512da60 100644
--- a/htdocs/product/fiche.php3
+++ b/htdocs/product/fiche.php3
@@ -34,7 +34,7 @@ if (!$user->rights->produit->lire)
accessforbidden();
}
-llxHeader("","","Dolibarr - fiche produit");
+llxHeader("","","Fiche produit");
if ($action == 'add')
{
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 5646a609b31..db7b57488fa 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -36,7 +36,7 @@ if ($action == 'update')
*
*/
-llxHeader();
+llxHeader("","","Accueil Produits et services");
print_titre("Produits et services");
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 6e8430dfb6f..e95471b9e3e 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -101,14 +101,14 @@ if ($result)
if ($ref || $snom || $sall)
{
- llxHeader("","","Dolibarr - Recherche Produit/Service");
+ llxHeader("","","Recherche Produit/Service");
print_barre_liste("Recherche d'un produit ou service", $page, $PHP_SELF, "&sref=$sref&snom=$snom&envente=$envente", $sortfield, $sortorder,'',$num);
}
else
{
$texte = "Liste des ".$types[$type]."s";
- llxHeader("","","Dolibarr - ".$texte);
+ llxHeader("","",$texte);
if (isset($envente) && $envente == 0)
{
$texte .= " hors vente";