diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 73239e5edbe..ab0f6875279 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -297,11 +297,11 @@ show_array_last_actions_done($max); */ if ($user->rights->societe->lire) { - $sql = "SELECT s.rowid,s.nom,".$db->pdate("datec")." as datec"; + $sql = "SELECT s.rowid,s.nom,s.client,".$db->pdate("datec")." as datec"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql.= " WHERE s.client = 1"; + $sql.= " WHERE s.client in (1,2)"; if ($socid) { $sql .= " AND s.rowid = $socid"; @@ -323,7 +323,7 @@ if ($user->rights->societe->lire) print ''; print ''; - print ''; + print ''; $i = 0; $var=false; @@ -331,7 +331,13 @@ if ($user->rights->societe->lire) { $objp = $db->fetch_object($resql); print ""; - print ""; + print ""; + if ($objp->client == 2) print "rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom.""; + print '"; print '"; print ''; $i++; diff --git a/htdocs/includes/menus/barre_left/auguria_backoffice.php b/htdocs/includes/menus/barre_left/auguria_backoffice.php index e682e6cefff..d2986beea1f 100644 --- a/htdocs/includes/menus/barre_left/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_backoffice.php @@ -145,7 +145,7 @@ class MenuLeft { if (! sizeof($this->menu_array)) { print '
'."\n"; - print $langs->trans("NoPermission"); + print $langs->trans("NoMenu"); print '
'; } else @@ -158,53 +158,55 @@ class MenuLeft { { if (($alt%2==0)) { - print '
'."\n"; + print '
'."\n"; } else { - print '
'."\n"; + print '
'."\n"; } } - - if ($this->menu_array[$i]['level']==0) + + // Place tabulation + $tabstring=''; + $tabul=($this->menu_array[$i]['level'] - 1); + if ($tabul > 0) + { + for ($j=0; $j < $tabul; $j++) + { + $tabstring.='    '; + } + } + + // Menu niveau 0 + if ($this->menu_array[$i]['level']==0) { - if ($contenu == 1) print '
'; if ($this->menu_array[$i]['enabled']) { - print '
menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; } else { - print '
'.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.''.$this->menu_array[$i]['titre'].'
'; } $contenu = 0; } - - - if ($this->menu_array[$i]['level']==1) { - if ($this->menu_array[$i]['enabled']) - print '
menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; - else - print '
'.$this->menu_array[$i]['titre'].'
'; - $contenu = 1; - } - - - if ($this->menu_array[$i]['level']==2) { - if ($this->menu_array[$i]['enabled']) - print '
   menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; - else - print '
   '.$this->menu_array[$i]['titre'].'
'; + // Menu niveau > 0 + if ($this->menu_array[$i]['level'] > 0) + { + if ($this->menu_array[$i]['level']==1) $contenu = 1; + + if ($this->menu_array[$i]['enabled']) + { + print '
'.$tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + } + else + { + print '
'.$tabstring.''.$this->menu_array[$i]['titre'].'
'; + } } - if ($this->menu_array[$i]['level']==3) { - if ($this->menu_array[$i]['enabled']) - print '
        menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; - else - print '
        '.$this->menu_array[$i]['titre'].'
'; - } - + if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) { print "
\n"; } @@ -215,10 +217,6 @@ class MenuLeft { } } - - - - } diff --git a/htdocs/includes/menus/barre_left/auguria_frontoffice.php b/htdocs/includes/menus/barre_left/auguria_frontoffice.php index 953a6468f6e..c01899d6f79 100644 --- a/htdocs/includes/menus/barre_left/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_frontoffice.php @@ -139,7 +139,7 @@ class MenuLeft { if (! sizeof($this->menu_array)) { print '
'."\n"; - print $langs->trans("NoPermission"); + print $langs->trans("NoMenu"); print '
'; } else @@ -148,56 +148,59 @@ class MenuLeft { for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) { $alt++; - if ($this->menu_array[$i]['level']==0) { + if ($this->menu_array[$i]['level']==0) + { if (($alt%2==0)) { - print '
'."\n"; + print '
'."\n"; } else { - print '
'."\n"; + print '
'."\n"; } } - if ($this->menu_array[$i]['level']==0) + // Place tabulation + $tabstring=''; + $tabul=($this->menu_array[$i]['level'] - 1); + if ($tabul > 0) + { + for ($j=0; $j < $tabul; $j++) + { + $tabstring.='    '; + } + } + + // Menu niveau 0 + if ($this->menu_array[$i]['level']==0) { - if ($contenu == 1) print '
'; if ($this->menu_array[$i]['enabled']) { - print '
menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; } else { - print '
'.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.''.$this->menu_array[$i]['titre'].'
'; } $contenu = 0; } - - - if ($this->menu_array[$i]['level']==1) { - if ($this->menu_array[$i]['enabled']) - print '
menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; - else - print '
'.$this->menu_array[$i]['titre'].'
'; - $contenu = 1; - } - + // Menu niveau > 0 + if ($this->menu_array[$i]['level'] > 0) + { + if ($this->menu_array[$i]['level']==1) $contenu = 1; - if ($this->menu_array[$i]['level']==2) { - if ($this->menu_array[$i]['enabled']) - print '
   menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; - else - print '
   '.$this->menu_array[$i]['titre'].'
'; + if ($this->menu_array[$i]['enabled']) + { + print '
'.$tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + } + else + { + print '
'.$tabstring.''.$this->menu_array[$i]['titre'].'
'; + } } - if ($this->menu_array[$i]['level']==3) { - if ($this->menu_array[$i]['enabled']) - print '
        menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; - else - print '
        '.$this->menu_array[$i]['titre'].'
'; - } - + if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) { print "
\n"; } diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index d0e55580034..9bbed20e598 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -262,25 +262,6 @@ class MenuLeft { { $langs->load("companies"); - // Actions - if ($conf->agenda->enabled) - { - $langs->load("agenda"); - - // Actions - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->allactions->read) - { - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->allactions->read); - } - // Prospects $newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire); @@ -894,6 +875,7 @@ class MenuLeft { } else { + $contenu = 0; for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) { $alt++; @@ -910,41 +892,48 @@ class MenuLeft { } // Place tabulation + $tabstring=''; $tabul=($this->menu_array[$i]['level'] - 1); if ($tabul > 0) { for ($j=0; $j < $tabul; $j++) { - print '    '; + $tabstring.='    '; } } - + // Menu niveau 0 if ($this->menu_array[$i]['level'] == 0) { + if ($contenu == 1) print '
'; if ($this->menu_array[$i]['enabled']) { - print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; } else { - print ''.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.''.$this->menu_array[$i]['titre'].'
'; } } // Menu niveau > 0 if ($this->menu_array[$i]['level'] > 0) { + if ($this->menu_array[$i]['level']==1) $contenu = 1; if ($this->menu_array[$i]['enabled']) { - print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; + print '
'; + print $tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; print $this->menu_array[$i]['titre']; print ''; // If title is not pure text and contains a table, no carriage return added if (! strstr($this->menu_array[$i]['titre'],''; + print '
'; } else { - print ''.$this->menu_array[$i]['titre'].'
'; + print '
'; + print $tabstring.''.$this->menu_array[$i]['titre'].'
'; + print '
'; } } @@ -954,6 +943,8 @@ class MenuLeft { print "
\n"; } } + if ($contenu == 1) print '
'; + } } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 0bc158a81eb..6973f830aa6 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -243,25 +243,6 @@ class MenuLeft { { $langs->load("companies"); - // Actions - if ($conf->agenda->enabled) - { - $langs->load("agenda"); - - // Actions - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->myactions->read) - { - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->allactions->read); - } - // Prospects /* $newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire); @@ -858,6 +839,7 @@ class MenuLeft { } else { + $contenu = 0; for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) { $alt++; @@ -874,41 +856,48 @@ class MenuLeft { } // Place tabulation + $tabstring=''; $tabul=($this->menu_array[$i]['level'] - 1); if ($tabul > 0) { for ($j=0; $j < $tabul; $j++) { - print '    '; + $tabstring.='    '; } } // Menu niveau 0 if ($this->menu_array[$i]['level'] == 0) { + if ($contenu == 1) print '
'; if ($this->menu_array[$i]['enabled']) { - print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; } else { - print ''.$this->menu_array[$i]['titre'].'
'; + print '
'.$tabstring.''.$this->menu_array[$i]['titre'].'
'; } } // Menu niveau > 0 if ($this->menu_array[$i]['level'] > 0) { + if ($this->menu_array[$i]['level']==1) $contenu = 1; if ($this->menu_array[$i]['enabled']) { - print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; + print '
'; + print $tabstring.'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; print $this->menu_array[$i]['titre']; print ''; // If title is not pure text and contains a table, no carriage return added if (! strstr($this->menu_array[$i]['titre'],''; + print '
'; } else { - print ''.$this->menu_array[$i]['titre'].'
'; + print '
'; + print $tabstring.''.$this->menu_array[$i]['titre'].'
'; + print '
'; } } @@ -918,6 +907,8 @@ class MenuLeft { print "
\n"; } } + if ($contenu == 1) print '
'; + } $conf->global->MAIN_SEARCHFORM_SOCIETE=0; diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index d0c284b44e6..923aef74855 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -23,7 +23,7 @@ BoxTitleLastRssInfos=Last %s news from %s BoxTitleLastProducts=Last %s modified products/services BoxTitleLastCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Last %s recorded suppliers -BoxTitleLastCustomers=Last %s recorded customers +BoxTitleLastCustomersOrProspects=Last %s recorded customers or prospects BoxTitleLastPropals=Last %s recorded proposals BoxTitleLastCustomerBills=Last %s customer's invoices BoxTitleLastSupplierBills=Last %s supplier's invoices diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 2b3285b147a..a98a3ad8c8c 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -23,7 +23,7 @@ BoxTitleLastRssInfos=Les %s derni BoxTitleLastProducts=Les %s derniers produits/services enregistrés BoxTitleLastCustomerOrders=Les %s dernières commandes clients modifiées BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistrés -BoxTitleLastCustomers=Les %s derniers clients enregistrés +BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects enregistrés BoxTitleLastPropals=Les %s dernières propositions enregistrés BoxTitleLastCustomerBills=Les %s dernières factures clients enregistrées BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs enregistrées diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index 12807be0e70..9817544104f 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -14,14 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/theme/auguria/auguria.css.php \brief Fichier de style CSS du theme Auguria - \version $Revision$ + \version $Id$ */ require("../../conf/conf.php"); @@ -356,11 +354,11 @@ img.login /* Barre de gauche */ /* ============================================================================== */ -a.vmenu:link { font-size:11px; text-align:left; font-weight: bold; color:#000000} -a.vmenu:visited { font-size:11px; text-align:left; font-weight: bold; color:#000000} -a.vmenu:active { font-size:11px; text-align:left; font-weight: bold; color:#000000} -a.vmenu:hover { font-size:11px; text-align:left; font-weight: bold; color:#000000} -font.vmenudisabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; } +a.vmenu:link { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } +a.vmenu:visited { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } +a.vmenu:active { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } +a.vmenu:hover { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } +font.vmenudisabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; margin: 1em 1em 1em 1em; } a.vsmenu:link { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } a.vsmenu:visited { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } @@ -374,17 +372,15 @@ a.help:active { font-size: 10px; font-weight: bold; background: #FFFFFF; b a.help:hover { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #6198BA; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; } -/* Pour menu gauche Auguria */ - -.menu_titre a {font-size:11px; text-align:left; font-weight: bold; color:#FFFFFF} -font.menu_titre_disabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; margin: 1em 1em 1em 1em; } - -a.menu_titre:link { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } -a.menu_titre:visited { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } -a.menu_titre:active { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } -a.menu_titre:hover { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } - -div.menu +div.blockvmenuimpair +{ + margin: 0px; + border-spacing: 0px; + padding: 0px; + width: 166px; + border : 0px solid #68ACCF; +} +div.blockvmenupair { margin: 0px; border-spacing: 0px; @@ -393,6 +389,27 @@ div.menu border : 0px solid #68ACCF; } +div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu +{ + display: block; + color: #000000; + text-align:left; + text-decoration: none; + padding: 4px; + margin: 0px; + background: #FFFFFF; + margin-bottom: -12px; +} + +div.help +{ + margin-left:5px; + margin-top:15px; + text-align: center; +} + + +/* Pour menu gauche Auguria */ div.menu_titre { background: url(); @@ -430,48 +447,6 @@ div.menu_fin { } - -div.blockvmenuimpair a.vmenu, div.blockvmenupair a.vmenu -{ - display: block; - color: #FFFFFF; - text-align:left; - text-decoration: none; - padding: 4px; - margin: 0px; - margin-bottom: -10px; - background: #FFFFFF; - background-image: url(); - background-position:top; - background-repeat:repeat-x; -} - -div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu -{ - display: block; - color: #000000; - text-align:left; - text-decoration: none; - padding: 4px; - margin: 0px; - background: #FFFFFF; - margin-bottom: -12px; -} - -div.blockvmenuimpair form .button, div.blockvmenupair form .button -{ - margin: 0px; - background: #6aabd1; - color: #FFFFFF; -} - -div.help -{ - margin-left:5px; - margin-top:15px; - text-align: center; -} - td.barre { border-right: 1px solid #000000; border-bottom: 1px solid #000000; diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index e53970c2bd7..62092229d4a 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -405,63 +405,6 @@ a.help:active { font-size:11px; font-family: helvetica, verdana, arial, sa a.help:hover { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; } - -/* Pour menu gauche auguria */ - -font.menu_titre_disabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; margin: 1em 1em 1em 1em; } - -a.menu_titre:link { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; } -a.menu_titre:visited { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; } -a.menu_titre:active { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; } -a.menu_titre:hover { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; } - -div.menu -{ - margin: 0px; - border-spacing: 0px; - padding: 0px; - width: 165px; - border: 0px solid #68ACCF; -} - - -div.menu_titre { - background: url(); - padding: 0px; - padding-top:7px; - padding-left:0px; - margin-top: 8px; - margin: 0px; - height: 21px; - text-align: left; - font-size : 12px; - color : #FFFFFF; - font-weight: bold; -} - -div.menu_contenu { - background: url(); - margin: 0px; - padding: 1px; - - padding-right: 6px; - font-size : 11px; - font-weight:normal; - color : #000000; - text-align: left; -} - -div.menu_fin { - background: url(); - margin: 0px; - padding: 0px; - height:6px; - width:165px; - background-repeat:no-repeat; -} - - - div.blockvmenupair { width:160px;
'.$langs->trans("BoxTitleLastCustomers",$max).'
'.$langs->trans("BoxTitleLastCustomersOrProspects",$max).'
rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom.""; + if ($objp->client == 1) print "rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom."'; + if ($objp->client == 1) print $langs->trans("Customer"); + if ($objp->client == 2) print $langs->trans("Prospect"); + print "'.dolibarr_print_date($objp->datec,'day')."