From 22402c38f81d945f0bf84220258e3a3a16d5a147 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Apr 2013 14:32:38 +0200
Subject: [PATCH] Still working on new menu management.

---
 htdocs/core/menus/standard/auguria_menu.php | 7 ++++---
 htdocs/core/menus/standard/eldy_menu.php    | 5 +++--
 htdocs/langs/en_US/banks.lang               | 3 ++-
 htdocs/langs/en_US/commercial.lang          | 3 ++-
 htdocs/langs/en_US/compta.lang              | 3 ++-
 htdocs/langs/en_US/products.lang            | 3 ++-
 htdocs/langs/fr_FR/banks.lang               | 3 ++-
 htdocs/langs/fr_FR/commercial.lang          | 1 +
 htdocs/langs/fr_FR/compta.lang              | 3 ++-
 htdocs/langs/fr_FR/products.lang            | 3 ++-
 10 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index d1a67514a2b..5fefb32d4a1 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -206,10 +206,11 @@ class MenuManager
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
         			print '<ul>';
-        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
-        			{
+        		    if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))
+        				|| strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php'))
+					{
         				// We add sub entry
-        				print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
+        				print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
         			}
         			foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         			{
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 3bd1b1aad5b..4530dcd6f8f 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -160,10 +160,11 @@ class MenuManager
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
         			print '<ul>';
-        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
+        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))
+        				|| strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php'))
 					{
         				// We add sub entry
-        				print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
+        				print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
         			}
        				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 6de8cf62879..de84677fc23 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -147,4 +147,5 @@ SelectChequeTransactionAndGenerate=Select/filter checks to include into the chec
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
\ No newline at end of file
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+BankDashboard=Bank accounts summary
\ No newline at end of file
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index baac58e4642..b6bd7c9881a 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -91,4 +91,5 @@ RecapAnnee=Summary of the year
 NoData=There is no data
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
-SearchPropal=Search a commercial proposal
\ No newline at end of file
+SearchPropal=Search a commercial proposal
+CommercialDashboard=Commercial summary
\ No newline at end of file
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 538b4f1784a..5e3a36e5051 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -151,4 +151,5 @@ Pcg_version=Pcg version
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
\ No newline at end of file
+InvoiceDispatched=Dispatched invoices
+AccountancyDashboard=Accountancy summary
\ No newline at end of file
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index fa6b3331d22..b58dec53dcb 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -183,4 +183,5 @@ CurrentProductPrice=Current price
 AlwaysUseNewPrice=Always use current price of product/service
 AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Price by quantity
-PriceByQuantityRange=Quantity range
\ No newline at end of file
+PriceByQuantityRange=Quantity range
+ProductsDashboard=Products/Services summary
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 815387fc4a6..c51d915602f 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -147,4 +147,5 @@ SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure
 InputReceiptNumber=Saisissez le relevé bancaire concerné par le rapprochement. Utilisez une valeur numérique triable (par exemple YYYYMM)
 EventualyAddCategory=Eventuellement, saisissez une catégorie dans laquelle classer les écritures
 ToConciliate=A rapprocher ?
-ThenCheckLinesAndConciliate=Ensuite, cochez les lignes présentes sur le relevé et cliquez sur
\ No newline at end of file
+ThenCheckLinesAndConciliate=Ensuite, cochez les lignes présentes sur le relevé et cliquez sur
+BankDashboard=Synthèse comptes bancaires
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index 79937cb84fb..5c5747baa92 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -92,3 +92,4 @@ NoData=Aucune donnée
 StatusProsp=Status prospection
 DraftPropals=Propositions brouillons
 SearchPropal=Rechercher une proposition
+CommercialDashboard=Synthèse commercial
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 12ea0024f63..1491a7820f4 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -162,4 +162,5 @@ Pcg_version=Version du plan
 Pcg_type=Classe de compte
 Pcg_subtype=Sous classe de compte
 InvoiceLinesToDispatch=Lignes de factures à ventiler
-InvoiceDispatched=Factures ventilées
\ No newline at end of file
+InvoiceDispatched=Factures ventilées
+AccountancyDashboard=Synthèse compta/tréso
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 234ea360a39..3d27fdd9d6d 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -183,4 +183,5 @@ CurrentProductPrice=Prix actuel
 AlwaysUseNewPrice=Toujours utiliser le prix du jour
 AlwaysUseFixedPrice=Utiliser le prix fixé
 PriceByQuantity=Prix par quantité
-PriceByQuantityRange=Grille de quantités
\ No newline at end of file
+PriceByQuantityRange=Grille de quantités
+ProductsDashboard=Synthèse produits/services
\ No newline at end of file