diff --git a/htdocs/adherents/cartes/pre.inc.php b/htdocs/adherents/cartes/pre.inc.php index c16b620a320..fe920d2b50b 100644 --- a/htdocs/adherents/cartes/pre.inc.php +++ b/htdocs/adherents/cartes/pre.inc.php @@ -39,15 +39,18 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Members")); $menu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?action=create",$langs->trans("NewMember")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php",$langs->trans("List")); $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1",$langs->trans("MenuMembersToValidate")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersUpToDate")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersValidated")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate")); $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated")); $menu->add(DOL_URL_ROOT."/public/adherents/","Espace adherents public"); - $menu->add(DOL_URL_ROOT."/adherents/index.php","Export"); - $menu->add_submenu(DOL_URL_ROOT."/adherents/htpasswd.php","Format htpasswd"); - $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php","Cartes d'adhérents"); + $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Exports")); + $menu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("Datas")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/htpasswd.php",$langs->trans("Filehtpasswd")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php",$langs->trans("MembersCards")); $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/etiquette.php","Etiquettes d'adhérents"); $langs->load("compta"); diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 39609ad4614..b0db204f6b9 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -139,8 +139,9 @@ print "\n"; print '
'; - print ''; + + print ''; @@ -163,7 +164,8 @@ print ''; print ""; -print ''; +print ''; + $sql = "SELECT c.cotisation, ".$db->pdate("c.dateadh")." as dateadh"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c"; diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php index 63f81d95177..0c7a275ead8 100644 --- a/htdocs/adherents/pre.inc.php +++ b/htdocs/adherents/pre.inc.php @@ -48,7 +48,7 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/public/adherents/","Espace adherents public"); - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Export")); + $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Exports")); $menu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("Datas")); $menu->add_submenu(DOL_URL_ROOT."/adherents/htpasswd.php",$langs->trans("Filehtpasswd")); $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php",$langs->trans("MembersCards")); diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 1ca7651de03..0162e89ae86 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -590,7 +590,7 @@ class MenuLeft { $langs->load("banks"); $newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=accountancy",$langs->trans("Banks"),0,$user->rights->adherent->lire); - $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=export&mainmenu=members",$langs->trans("Export"),0,$user->rights->adherent->export); + $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=export&mainmenu=members",$langs->trans("Exports"),0,$user->rights->adherent->export); if ($leftmenu=="export") $newmenu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("Datas"),1,$user->rights->adherent->export); if ($leftmenu=="export") $newmenu->add_submenu(DOL_URL_ROOT."/adherents/htpasswd.php?leftmenu=export",$langs->trans("Filehtpasswd"),1,$user->rights->adherent->export); if ($leftmenu=="export") $newmenu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export); diff --git a/htdocs/install/index.php b/htdocs/install/index.php index 174ff3b2440..9d065f477ec 100644 --- a/htdocs/install/index.php +++ b/htdocs/install/index.php @@ -35,7 +35,7 @@ $err = 0; // Si fichier conf existe deja, on est pas sur une premiere install, // on ne passe donc pas par la page de choix de langue -if (!file_exists($conffile)) +if (file_exists($conffile)) { header("Location: check.php"); exit;