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

Fix: Numerous fixes in menu handling

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-26 22:03:50 +00:00
parent be1ef0ccbe
commit 79549949b4
29 changed files with 230 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/bank/index.php
View File

@ -47,7 +47,6 @@ $statut=isset($_GET["statut"])?$_GET["statut"]:'';
llxHeader();
$link='';
if ($statut == '') $link='<a href="'.$_SERVER["PHP_SELF"].'?statut=all">'.$langs->trans("IncludeClosedAccount").'</a>';
if ($statut == 'all') $link='<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("OnlyOpenedAccount").'</a>';

38
htdocs/compta/bank/pre.inc.php
View File

@ -32,6 +32,18 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
$langs->load("banks");
$langs->load("categories");
/**
*
* @param $head
* @param $title
* @param $help_url
* @param $target
* @param $disablejs
* @param $disablehead
* @param $arrayofjs
* @param $arrayofcss
*/
function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
{
global $db, $user, $conf, $langs;
@ -41,30 +53,6 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire);
$menu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
$menu->add_submenu(DOL_URL_ROOT."/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer);
$menu->add_submenu(DOL_URL_ROOT."/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
$menu->add_submenu(DOL_URL_ROOT."/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire);
if ($user->rights->banque->transfer)
{
$menu->add_submenu(DOL_URL_ROOT."/compta/bank/virement.php",$langs->trans("BankTransfers"),1,$user->rights->banque->transfer);
}
// Gestion cheques
if ($conf->facture->enabled && $conf->banque->enabled)
{
$langs->load("bills");
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=bank&amp;mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque);
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=bank&amp;mainmenu=bank&amp;action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=bank&amp;mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque);
}
// Entry for each bank account
if ($user->rights->banque->lire)
{
@ -96,6 +84,6 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
$db->free($resql);
}
left_menu($menu->liste);
left_menu('', $help_url, '', $menu->liste);
}
?>

6
htdocs/compta/paiement/cheque/pre.inc.php
View File

@ -41,7 +41,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
$menu = new Menu();
/*
$menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire);
$menu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
@ -64,7 +64,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=bank&amp;mainmenu=bank&amp;action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=bank&amp;mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque);
}
*/
// Entry for each bank account
if ($user->rights->banque->lire)
{
@ -96,7 +96,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
$db->free($resql);
}
left_menu($menu->liste);
left_menu('', $help_url, '', $menu->liste);
}
?>

2
htdocs/compta/prelevement/bon.php
View File

@ -28,6 +28,8 @@ require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php";
$langs->load("bills");
$langs->load("categories");
/*
* Securite acces client

1
htdocs/compta/prelevement/bons.php
View File

@ -28,6 +28,7 @@
require('../../main.inc.php');
$langs->load("widthdrawals");
$langs->load("categories");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';

1
htdocs/compta/prelevement/demandes.php
View File

@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
$langs->load("widthdrawals");
$langs->load("companies");
$langs->load("categories");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';

1
htdocs/compta/prelevement/factures.php
View File

@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.clas
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("companies");
$langs->load("categories");
// Securite acces client
if ($user->societe_id > 0) accessforbidden();

9
htdocs/compta/prelevement/facturesrejets.php
View File

@ -24,12 +24,15 @@ require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php";
$langs->load("categories");
/*
* Security check
*/
// Security check
if ($user->societe_id > 0) accessforbidden();
/*
* View
*/
llxHeader('',$langs->trans("WithdrawalReceipt"));
$h = 0;

5
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -29,9 +29,14 @@ require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("categories");
// Securite acces client
if ($user->societe_id > 0) accessforbidden();
/*
* View
*/
llxHeader('',$langs->trans("WithdrawalReceipt"));
$h = 0;

3
htdocs/compta/prelevement/fiche-stat.php
View File

@ -31,7 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.
if ($user->societe_id > 0) accessforbidden();
$langs->load("withdrawals");
$langs->load("main");
$langs->load("categories");
/*
* View

2
htdocs/compta/prelevement/fiche.php
View File

@ -33,7 +33,7 @@ accessforbidden();
$langs->load("bills");
$langs->load("withdrawals");
$langs->load("main");
$langs->load("categories");
// Security check

1
htdocs/compta/prelevement/index.php
View File

@ -30,6 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
$langs->load("withdrawals");
$langs->load("categories");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';

6
htdocs/compta/prelevement/ligne.php
View File

@ -37,7 +37,7 @@ if ($user->societe_id > 0) accessforbidden();
$langs->load("bills");
$langs->load("withdrawals");
$langs->load("main");
$langs->load("categories");
if ($_POST["action"] == 'confirm_rejet')
@ -92,7 +92,7 @@ $h++;
if ($_GET["id"])
{
$lipre = new LignePrelevement($db, $user);
$lipre->statuts[0] = $langs->trans("StatusWaiting");
$lipre->statuts[2] = $langs->trans("StatusCredited");
$lipre->statuts[3] = $langs->trans("StatusRefused");
@ -156,7 +156,7 @@ if ($_GET["id"])
$soc->fetch($lipre->socid);
$rej = new RejetPrelevement($db, $user);
$rej->motifs[0] = $langs->trans("StatusMotif0");
$rej->motifs[1] = $langs->trans("StatusMotif1");
$rej->motifs[2] = $langs->trans("StatusMotif2");

2
htdocs/compta/prelevement/lignes.php
View File

@ -32,6 +32,8 @@ require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
// Security check
if ($user->societe_id > 0) accessforbidden();
$langs->load("categories");
/*
* View

1
htdocs/compta/prelevement/liste.php
View File

@ -29,6 +29,7 @@ require('../../main.inc.php');
$langs->load("withdrawals");
$langs->load("companies");
$langs->load("categories");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';

1
htdocs/compta/prelevement/liste_factures.php
View File

@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("withdrawals");
$langs->load("companies");
$langs->load("categories");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';

1
htdocs/compta/prelevement/rejets.php
View File

@ -27,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("withdrawals");
$langs->load("companies");
$langs->load("categories");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';

1
htdocs/compta/prelevement/stats.php
View File

@ -29,6 +29,7 @@ require('../../main.inc.php');
$langs->load("withdrawals");
$langs->load("companies");
$langs->load("categories");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';

2
htdocs/ftp/pre.inc.php
View File

@ -53,6 +53,6 @@ function llxHeader($head = '', $title='', $help_url='', $morehtml='')
}
left_menu($menu->liste, $help_url, $morehtml);
left_menu($menu->liste, $help_url, $morehtml, '');
}
?>

17
htdocs/includes/menus/barre_left/auguria.lib.php
View File

@ -30,7 +30,7 @@
*
* @param unknown_type $db
*/
function print_left_auguria_menu($db,$menu_array)
function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
{
global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
@ -99,17 +99,18 @@ function print_left_auguria_menu($db,$menu_array)
if ($mainmenu && ! in_array($mainmenu,$overwritemenufor)) { $mainmenu=""; }
}
//var_dump($newmenu->liste);
//var_dump($this->menu_array);
/**
* Si on est sur un cas gere de surcharge du menu, on ecrase celui par defaut
*/
if ($mainmenu) {
if ($leftmenu == 'bank') $menu_array=array_merge($menu_array,$newmenu->liste);
else $menu_array=$newmenu->liste;
}
//var_dump($menu_array_before);exit;
//var_dump($menu_array_after);exit;
$menu_array=$newmenu->liste;
//if ($mainmenu) {
if (is_array($menu_array_before)) $menu_array=array_merge($menu_array_before, $menu_array);
if (is_array($menu_array_after)) $menu_array=array_merge($menu_array, $menu_array_after);
//}
//var_dump($menu_array);exit;
// Affichage du menu
$alt=0;

17
htdocs/includes/menus/barre_left/auguria_backoffice.php
View File

@ -39,16 +39,23 @@ class MenuLeft {
var $require_top=array("auguria_backoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier
var $db;
var $menu_array;
var $menu_array_after;
/**
* \brief Constructeur
* \param db Handler d'acces base de donnee
* \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php
* \brief Constructor
* \param db Database handler
* \param menu_array Table of menu entries to show before entries of menu handler
* \param menu_array_after Table of menu entries to show after entries of menu handler
*
*/
function MenuLeft($db,&$menu_array='')
function MenuLeft($db,&$menu_array='',&$menu_array_after='')
{
$this->db=$db;
$this->menu_array=$menu_array;
$this->menu_array_after=$menu_array_after;
}
@ -60,7 +67,7 @@ class MenuLeft {
{
require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/auguria.lib.php');
$res=print_left_auguria_menu($this->db,$this->menu_array);
$res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);
return $res;
}

16
htdocs/includes/menus/barre_left/auguria_frontoffice.php
View File

@ -39,16 +39,22 @@ class MenuLeft {
var $require_top=array("auguria_frontoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier
var $db;
var $menu_array;
var $menu_array_after;
/**
* \brief Constructeur
* \param db Handler d'acces base de donnee
* \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php
* \brief Constructor
* \param db Database handler
* \param menu_array Table of menu entries to show before entries of menu handler
* \param menu_array_after Table of menu entries to show after entries of menu handler
*/
function MenuLeft($db,&$menu_array='')
function MenuLeft($db,&$menu_array='',&$menu_array_after='')
{
$this->db=$db;
$this->menu_array=$menu_array;
$this->menu_array_after=$menu_array_after;
}
@ -60,7 +66,7 @@ class MenuLeft {
{
require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/auguria.lib.php');
$res=print_left_auguria_menu($this->db,$this->menu_array);
$res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);
$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
$conf->global->MAIN_SEARCHFORM_CONTACT=0;

102
htdocs/includes/menus/barre_left/eldy.lib.php
View File

@ -30,7 +30,7 @@
*
* @param unknown_type $db
*/
function print_left_eldy_menu($db,$menu_array)
function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
{
global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
@ -504,44 +504,6 @@ function print_left_eldy_menu($db,$menu_array)
}
// Prelevements
if ($conf->prelevement->enabled)
{
$langs->load("withdrawals");
$langs->load("banks");
$newmenu->add(DOL_URL_ROOT."/compta/prelevement/index.php?leftmenu=withdraw",$langs->trans("StandingOrders"),0,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/create.php",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer);
//if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrder"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=0",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire);
//if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=1",$langs->trans("StandingOrderProcessed"),2,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/bons.php",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste.php",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste_factures.php",$langs->trans("WithdrawedBills"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/rejets.php",$langs->trans("Rejects"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/stats.php",$langs->trans("Statistics"),1,$user->rights->prelevement->bons->lire);
//if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer);
}
// Gestion cheques
if ($conf->facture->enabled && $conf->banque->enabled)
{
$newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque);
if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);
if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque);
}
// Bank-Caisse
if ($conf->banque->enabled)
{
$langs->load("banks");
$newmenu->add(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire);
}
// Rapports
if ($conf->compta->enabled || $conf->accounting->enabled)
{
@ -570,6 +532,58 @@ function print_left_eldy_menu($db,$menu_array)
}
/*
* Menu BANK
*/
if ($mainmenu == 'bank')
{
$langs->load("withdrawals");
$langs->load("banks");
$langs->load("bills");
// Bank-Caisse
if ($conf->banque->enabled)
{
$langs->load("banks");
$newmenu->add(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
$newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer);
$newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire);
}
// Prelevements
if ($conf->prelevement->enabled)
{
$newmenu->add(DOL_URL_ROOT."/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank",$langs->trans("StandingOrders"),0,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/create.php?mainmenu=bank",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer);
//if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrder"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=0&amp;mainmenu=bank",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire);
//if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=1",$langs->trans("StandingOrderProcessed"),2,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/bons.php?mainmenu=bank",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste.php?mainmenu=bank",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/liste_factures.php?mainmenu=bank",$langs->trans("WithdrawedBills"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/rejets.php?mainmenu=bank",$langs->trans("Rejects"),1,$user->rights->prelevement->bons->lire);
if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/stats.php?mainmenu=bank",$langs->trans("Statistics"),1,$user->rights->prelevement->bons->lire);
//if ($leftmenu=="withdraw") $newmenu->add(DOL_URL_ROOT."/compta/prelevement/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer);
}
// Gestion cheques
if ($conf->facture->enabled && $conf->banque->enabled)
{
$newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque);
if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new&amp;mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);
if (preg_match("/checks/i",$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks&amp;mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque);
}
}
/*
* Menu PRODUITS-SERVICES
*/
@ -850,9 +864,13 @@ function print_left_eldy_menu($db,$menu_array)
/**
* Si on est sur un cas gere de surcharge du menu, on ecrase celui par defaut
*/
if ($mainmenu) {
$menu_array=$newmenu->liste;
}
//var_dump($menu_array_before);exit;
//var_dump($menu_array_after);exit;
//if ($mainmenu) {
$menu_array=$newmenu->liste;
if (is_array($menu_array_before)) $menu_array=array_merge($menu_array_before, $menu_array);
if (is_array($menu_array_after)) $menu_array=array_merge($menu_array, $menu_array_after);
//}
// Affichage du menu
$alt=0;

18
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -37,20 +37,24 @@
*/
class MenuLeft {
var $db;
var $menu_array;
var $require_top=array("eldy_backoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier
var $db;
var $menu_array;
var $menu_array_after;
/**
* \brief Constructeur
* \param db Handler d'acces base de donnee
* \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php
* \brief Constructor
* \param db Database handler
* \param menu_array Table of menu entries to show before entries of menu handler
* \param menu_array_after Table of menu entries to show after entries of menu handler
*/
function MenuLeft($db,&$menu_array='')
function MenuLeft($db,&$menu_array='',&$menu_array_after='')
{
$this->db=$db;
$this->menu_array=$menu_array;
$this->menu_array_after=$menu_array_after;
}
@ -62,7 +66,7 @@ class MenuLeft {
{
require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/eldy.lib.php');
$res=print_left_eldy_menu($this->db,$this->menu_array);
$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);
return $res;
}

18
htdocs/includes/menus/barre_left/eldy_frontoffice.php
View File

@ -36,20 +36,24 @@
*/
class MenuLeft {
var $db;
var $menu_array;
var $require_top=array("eldy_frontoffice"); // Si doit etre en phase avec un gestionnaire de menu du haut particulier
var $db;
var $menu_array;
var $menu_array_after;
/**
* \brief Constructeur
* \param db Handler d'acces base de donnee
* \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php
* \brief Constructor
* \param db Database handler
* \param menu_array Table of menu entries to show before entries of menu handler
* \param menu_array_after Table of menu entries to show after entries of menu handler
*/
function MenuLeft($db,&$menu_array='')
function MenuLeft($db,&$menu_array='',&$menu_array_after='')
{
$this->db=$db;
$this->menu_array=$menu_array;
$this->menu_array_after=$menu_array_after;
}
@ -61,7 +65,7 @@ class MenuLeft {
{
require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/eldy.lib.php');
$res=print_left_eldy_menu($this->db,$this->menu_array);
$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);
$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
$conf->global->MAIN_SEARCHFORM_CONTACT=0;

14
htdocs/includes/menus/barre_left/empty.php
View File

@ -30,16 +30,22 @@ class MenuLeft {
var $require_top=array("empty"); // If this top menu handler must be used with a particular left menu handler
var $db;
var $menu_array;
var $menu_array_after;
/**
* \brief Constructor
* \param db Dabatase handler
* \param menu_array Menu array that you will override in showmenu() function
* \brief Constructor
* \param db Database handler
* \param menu_array Table of menu entries to show before entries of menu handler
* \param menu_array_after Table of menu entries to show after entries of menu handler
*/
function MenuLeft($db,&$menu_array='')
function MenuLeft($db,&$menu_array='',&$menu_array_after='')
{
$this->db=$db;
$this->menu_array=$menu_array;
$this->menu_array_after=$menu_array_after;
}

42
htdocs/includes/menus/barre_top/eldy.lib.php
View File

@ -188,7 +188,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
}
// Financial
if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled
if ($conf->compta->enabled || $conf->accounting->enabled
|| $conf->facture->enabled || $conf->deplacement->enabled)
{
$langs->load("compta");
@ -228,6 +228,46 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
}
}
// Bank
if ($conf->banque->enabled || $conf->prelevement->enabled)
{
$langs->load("compta");
$langs->load("banks");
$classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank")
{
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='bank';
if ($user->rights->banque->lire)
{
print_start_menu_entry($idsel);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu="'.($atarget?" target=$atarget":"").'>';
print_text_menu_entry($langs->trans("MenuBankCash"));
print '</a>';
print_end_menu_entry();
}
else
{
if (! $hideifnotallowed)
{
print_start_menu_entry($idsel);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#">';
print_text_menu_entry($langs->trans("MenuBankCash"));
print '</a>';
print_end_menu_entry();
}
}
}
// Projects
if ($conf->projet->enabled)
{

8
htdocs/langs/en_IN/compta.lang Normal file
View File

@ -0,0 +1,8 @@
# Dolibarr language file - en_IN - compta
CHARSET=UTF-8
CheckReceipt=Cheque deposit
CheckReceiptShort=Cheque deposit
NewCheckDeposit=New cheque deposit
NoWaitingChecks=No cheques waiting for deposit.
DateChequeReceived=Cheque receiving input date
NbOfCheques=Nb of cheques

18
htdocs/main.inc.php
View File

@ -1011,13 +1011,14 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
/**
* \brief Show left menu bar
* \param menu_array Table menu entries
* \param menu_array_before Table of menu entries to show before entries of menu handler
* \param helppagename Name of wiki page for help ('' by default).
* Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
* For other external page: http://server/url
* Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
* For other external page: http://server/url
* \param moresearchform Search Form Permanent Supplemental
* \param menu_array_after Table of menu entries to show after entries of menu handler
*/
function left_menu($menu_array, $helppagename='', $moresearchform='')
function left_menu($menu_array_before, $helppagename='', $moresearchform='', $menu_array_after='')
{
global $user, $conf, $langs, $db;
@ -1083,10 +1084,11 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
$conf->left_menu='eldy_backoffice.php';
include_once(DOL_DOCUMENT_ROOT ."/includes/menus/barre_left/".$conf->left_menu);
}
$menuleft=new MenuLeft($db,$menu_array);
$menuleft->showmenu();
$menuleft=new MenuLeft($db,$menu_array_before,$menu_array_after);
$menuleft->showmenu(); // output menu_array and menu found in database
// Show other forms
if ($searchform)
{
print "\n";
@ -1097,11 +1099,13 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
print "<!-- End SearchForm -->\n";
}
// More search form
if ($moresearchform)
{
print $moresearchform;
}
// Bookmarks
if ($bookmarks)
{
print "\n";
@ -1144,9 +1148,9 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
}
}
// Link to bugtrack
if (! empty($conf->global->MAIN_SHOW_BUGTRACK_LINK))
{
// Link to bugtrack
$bugbaseurl='http://savannah.nongnu.org/bugs/?';
$bugbaseurl.='func=additem&group=dolibarr&privacy=1&';
$bugbaseurl.="&details=";