lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Still working on new menu management.

Browse Source
This commit is contained in:
Laurent Destailleur 2013-04-14 14:32:38 +02:00
parent baad1ffc56
commit 22402c38f8
10 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/menus/standard/auguria_menu.php
View File

@ -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'
{

5
htdocs/core/menus/standard/eldy_menu.php
View File

@ -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'
{

3
htdocs/langs/en_US/banks.lang
View File

@ -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
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
BankDashboard=Bank accounts summary

3
htdocs/langs/en_US/commercial.lang
View File

@ -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
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary

3
htdocs/langs/en_US/compta.lang
View File

@ -151,4 +151,5 @@ Pcg_version=Pcg version
Pcg_type=Pcg type
Pcg_subtype=Pcg subtype
InvoiceLinesToDispatch=Invoice lines to dispatch
InvoiceDispatched=Dispatched invoices
InvoiceDispatched=Dispatched invoices
AccountancyDashboard=Accountancy summary

3
htdocs/langs/en_US/products.lang
View File

@ -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
PriceByQuantityRange=Quantity range
ProductsDashboard=Products/Services summary

3
htdocs/langs/fr_FR/banks.lang
View File

@ -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
ThenCheckLinesAndConciliate=Ensuite, cochez les lignes présentes sur le relevé et cliquez sur
BankDashboard=Synthèse comptes bancaires

1
htdocs/langs/fr_FR/commercial.lang
View File

@ -92,3 +92,4 @@ NoData=Aucune donnée
StatusProsp=Status prospection
DraftPropals=Propositions brouillons
SearchPropal=Rechercher une proposition
CommercialDashboard=Synthèse commercial

3
htdocs/langs/fr_FR/compta.lang
View File

@ -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
InvoiceDispatched=Factures ventilées
AccountancyDashboard=Synthèse compta/tréso

3
htdocs/langs/fr_FR/products.lang
View File

@ -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
PriceByQuantityRange=Grille de quantités
ProductsDashboard=Synthèse produits/services