Fix: Warning PHP

htdocs/fourn/stats.php

@@ -45,8 +45,6 @@ $langs->load("suppliers");
 $langs->load("orders");
 $langs->load("companies");
 
-llxHeader();
-
 // Sécurité accés client
 $socid='';
 if ($user->societe_id > 0) 
@@ -61,12 +59,17 @@ $offset = $conf->liste_limit * $page ;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="year";
 
+$years=array();
+$fourns=array();
+
 
 /*
- * Mode Liste
+ * Affichage liste
  *
  */
 
+llxHeader();
+
 $sql = "SELECT s.idp, s.nom, s.ville, ca.ca_genere as ca, ca.year";
 $sql.= " , code_fournisseur, code_compta_fournisseur";
 if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";

htdocs/includes/menus/barre_left/eldy_backoffice.php

@@ -583,7 +583,9 @@ class MenuLeft {
 							{
 								$newmenu->add_submenu(DOL_URL_ROOT."/soc.php??leftmenu=suppliers&action=create&type=f",$langs->trans("NewSupplier"), 1, $user->rights->societe->creer && $user->rights->fournisseur->lire);
 							}
+						    $newmenu->add_submenu(DOL_URL_ROOT."/fourn/liste.php",$langs->trans("List"));
 							$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=suppliers&type=f",$langs->trans("Contacts"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire);
+					    	$newmenu->add_submenu(DOL_URL_ROOT."/fourn/stats.php",$langs->trans("Statistics"));
 						}
 
 						if ($conf->facture->enabled)

htdocs/includes/menus/barre_top/eldy_frontoffice.php

@@ -49,7 +49,11 @@ class MenuTop {
      */
     function MenuTop($db)
     {
+        global $langs;
         $this->db=$db;
+        
+        $langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
+        $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
     }
     
     
@@ -94,13 +98,15 @@ class MenuTop {
         print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a></td>';
 
 
-        // Members
+        // Third parties
-        if ($conf->adherent->enabled)
+        if (($conf->societe->enabled && $user->rights->societe->lire)
+        	|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
         {
-            $langs->load("members");
+            $langs->load("companies");
+            $langs->load("suppliers");
         
             $class="";
-            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
+            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
             {
                 $class='class="tmenu" id="sel"';
             }
@@ -109,9 +115,9 @@ class MenuTop {
                 $class = 'class="tmenu"';
             }
         
-            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'</a></td>';
+            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a></td>';
         }
-        
+
         // Products-Services
         if ($conf->produit->enabled || $conf->service->enabled)
         {
@@ -139,24 +145,6 @@ class MenuTop {
 */
         }
 
-        // Supplier
-        if ($conf->fournisseur->enabled)
-        {
-            $langs->load("suppliers");
-        
-            $class="";
-            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
-            {
-                $class='class="tmenu" id="sel"';
-            }
-            else
-            {
-                $class = 'class="tmenu"';
-            }
-        
-//            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/fourn/index.php?mainmenu=suppliers&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").'</a></td>';
-        }
-
         // Commercial
         if ($conf->commercial->enabled)
         {
@@ -175,6 +163,24 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
         
         }
+
+        // Suppliers
+        if ($conf->fournisseur->enabled)
+        {
+            $langs->load("suppliers");
+        
+            $class="";
+            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            else
+            {
+                $class = 'class="tmenu"';
+            }
+        
+//            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/fourn/index.php?mainmenu=suppliers&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").'</a></td>';
+        }
         
         // Financial
         if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled
@@ -272,7 +278,25 @@ class MenuTop {
 
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/mantis/mantis.php?mainmenu=mantis"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("BugTracker").'</a></td>';
         }
-               
+
+        // Members
+        if ($conf->adherent->enabled)
+        {
+            $langs->load("members");
+        
+            $class="";
+            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            else
+            {
+                $class = 'class="tmenu"';
+            }
+        
+            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'</a></td>';
+        }
+        
         print '</tr></table>';
 
     }