diff --git a/htdocs/fourn/facture/pre.inc.php b/htdocs/fourn/facture/pre.inc.php index 87a7d283d19..659ce35f31d 100644 --- a/htdocs/fourn/facture/pre.inc.php +++ b/htdocs/fourn/facture/pre.inc.php @@ -30,38 +30,63 @@ require("../../main.inc.php"); -function llxHeader($head = "", $title = "") { +function llxHeader($head = "", $title = "", $addons='') { global $user, $conf, $langs; + $langs->load("suppliers"); + top_menu($head, $title); $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); - if ($user->societe_id == 0) + if (is_array($addons)) { - $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("New")); + //$menu->add($url, $libelle); + + $menu->add($addons[0][0], $addons[0][1]); } - if ($conf->societe->enabled) { - $menu->add_submenu(DOL_URL_ROOT."/fourn/contact.php",$langs->trans("Contacts")); + if ($conf->fournisseur->enabled) + { + $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); + + // Sécurité accés client + if ($user->societe_id == 0) + { + $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier")); + } + } + + if ($conf->societe->enabled) + { + $menu->add_submenu(DOL_URL_ROOT."/fourn/contact.php",$langs->trans("Contacts")); + } + + if ($conf->facture->enabled) + { + $langs->load("bills"); + $menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills")); + + if ($user->societe_id == 0) + { + $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill")); + } + + $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments")); + } + + if ($conf->commande->enabled) + { + $langs->load("orders"); + $menu->add_submenu(DOL_URL_ROOT."/fourn/commande/",$langs->trans("Orders")); } - if ($conf->facture->enabled) { - $langs->load("bills"); - $menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills")); - - if ($user->societe_id == 0) - { - $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("New")); - } - - $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments")); + if ($conf->produit->enabled || $conf->service->enabled) + { + $menu->add(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("Products")); } - $menu->add(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("Products")); - left_menu($menu->liste); } diff --git a/htdocs/fourn/pre.inc.php b/htdocs/fourn/pre.inc.php index e7984388f9f..2509a52ea70 100644 --- a/htdocs/fourn/pre.inc.php +++ b/htdocs/fourn/pre.inc.php @@ -32,6 +32,7 @@ require("../main.inc.php"); function llxHeader($head = "", $title="", $addons='') { global $user, $conf, $langs; + $langs->load("suppliers"); top_menu($head, $title); @@ -52,7 +53,7 @@ function llxHeader($head = "", $title="", $addons='') { // Sécurité accés client if ($user->societe_id == 0) { - $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("New")); + $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier")); } } @@ -68,7 +69,7 @@ function llxHeader($head = "", $title="", $addons='') { if ($user->societe_id == 0) { - $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("New")); + $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill")); } $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments")); @@ -76,6 +77,7 @@ function llxHeader($head = "", $title="", $addons='') { if ($conf->commande->enabled) { + $langs->load("orders"); $menu->add_submenu(DOL_URL_ROOT."/fourn/commande/",$langs->trans("Orders")); } diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 2d853bd7287..65ab924c0d0 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -1,4 +1,7 @@ # Dolibarr language file - en_US - suppliers Suppliers=Suppliers AddSupplier=Add a supplier -SupplierRemoved=Supplier removed \ No newline at end of file +SupplierRemoved=Supplier removed +NewSupplier=Nes supplier +History=History +OrderCard=Order card \ No newline at end of file diff --git a/htdocs/langs/fr_BE/suppliers.lang b/htdocs/langs/fr_BE/suppliers.lang index 6ced69d94f6..4fb5d0875b9 100644 --- a/htdocs/langs/fr_BE/suppliers.lang +++ b/htdocs/langs/fr_BE/suppliers.lang @@ -1,2 +1,7 @@ # Dolibarr language file - fr_BE - suppliers -Suppliers=Fournisseurs \ No newline at end of file +Suppliers=Fournisseurs +AddSupplier=Ajouter un fournisseur +SupplierRemoved=Fournisseur supprimé +NewSupplier=Nouveau fournisseur +History=Historique +OrderCard=Fiche commande \ No newline at end of file diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index 62d2484f215..3162f0d8563 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -2,6 +2,6 @@ Suppliers=Fournisseurs AddSupplier=Ajouter un fournisseur SupplierRemoved=Fournisseur supprimé -New=Ajouter un fournisseur +NewSupplier=Nouveau fournisseur History=Historique OrderCard=Fiche commande \ No newline at end of file