Modifications au gestionnaire de menu eldy pour afficher une entre de menu des socits (tiers)

This commit is contained in:
Laurent Destailleur 2006-12-20 20:03:52 +00:00
parent b8c6e2c6ea
commit a09d7faf72
11 changed files with 156 additions and 50 deletions

View File

@ -54,9 +54,9 @@ if ($user->societe_id > 0)
}
if (! $sortfield) $sortfield="p.name";
if (! $sortorder) $sortorder="ASC";
if ($page == -1) { $page = 0 ; }
if (! $sortfield) $sortfield="p.name";
if ($page < 0) { $page = 0 ; }
$limit = $conf->liste_limit;
$offset = $limit * $page ;

View File

@ -35,10 +35,12 @@ $langs->load("suppliers");
// Sécurité accés client
$socid='';
if ($_GET["socid"]) { $socid=$_GET["socid"]; }
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
$action = '';
$socid = $user->societe_id;
}
@ -64,8 +66,20 @@ $offset = $limit * $page ;
$langs->load("companies");
$titre=$langs->trans("ListOfContacts");
if ($type == "c") { $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')'; }
if ($type == "f") { $titre=$langs->trans("ListOfSuppliersContacts").' ('.$langs->trans("ThirdPartySuppliers").')'; }
if ($type == "c")
{
$titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')';
$urlfiche="fiche.php";
}
if ($type == "p")
{
$titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyProspects").')';
$urlfiche="prospect/fiche.php";
}
if ($type == "f") {
$titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartySuppliers").')';
$urlfiche="fiche.php";
}
if ($view == 'phone') { $text="( Vue Téléphones)"; }
if ($view == 'mail') { $text=" (Vue EMail)"; }
if ($view == 'recent') { $text=" (Récents)"; }
@ -131,6 +145,10 @@ if ($type == "c") // filtre sur type
{
$sql .= " AND client = 1";
}
if ($type == "p") // filtre sur type
{
$sql .= " AND client = 2";
}
if ($sall)
{
$sql .= " AND (p.name like '%".addslashes($sall)."%' OR p.firstname like '%".addslashes($sall)."%' OR p.email like '%".addslashes($sall)."%') ";

View File

@ -98,7 +98,7 @@ class MenuLeft {
$newmenu = new Menu();
$overwritemenufor=array('home','members','products','suppliers','commercial','accountancy','project','tools');
$overwritemenufor=array('home','companies','members','products','suppliers','commercial','accountancy','project','tools');
/**
* On definit newmenu en fonction de mainmenu et leftmenu
@ -161,21 +161,77 @@ class MenuLeft {
/*
* Menu SOCIETES
*/
if ($mainmenu == 'companies') {
if ($mainmenu == 'companies')
{
// Sociétés
if ($conf->societe->enabled && $user->rights->societe->lire)
{
$langs->load("companies");
$newmenu->add(DOL_URL_ROOT."/societe.php", $langs->trans("ThirdParty"));
if ($user->rights->societe->creer)
{
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?action=create", $langs->trans("MenuNewThirdParty"));
}
if(is_dir("societe/groupe"))
{
$newmenu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup"));
}
}
// Fournisseurs
$langs->load("suppliers");
if ($conf->societe->enabled && $conf->fournisseur->enabled)
{
$newmenu->add(DOL_URL_ROOT."/fourn/liste.php?leftmenu=suppliers", $langs->trans("Suppliers"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire);
// Sécurité accés client
if ($user->societe_id == 0)
{
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("NewSupplier"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire);
}
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=suppliers&amp;type=f",$langs->trans("Contacts"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire);
}
// Prospects
if ($conf->societe->enabled && $user->rights->societe->lire)
{
$newmenu->add(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("Prospects"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&amp;type=p", $langs->trans("Contacts"), 2, $user->rights->societe->lire);
}
// Clients
if ($conf->societe->enabled && $user->rights->societe->lire)
{
$newmenu->add(DOL_URL_ROOT."/comm/clients.php?leftmenu=customers", $langs->trans("Customers"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&amp;type=c", $langs->trans("Contacts"), 2, $user->rights->societe->lire);
}
// Contacts
$newmenu->add(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("Contacts"), 0, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/fiche.php?leftmenu=contacts&amp;action=create", $langs->trans("NewContact"), 1, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->lire);
}
/*
* Menu COMMERCIAL
*/
if ($mainmenu == 'commercial') {
if ($mainmenu == 'commercial')
{
$langs->load("companies");
// Prospects
$newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 1, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("List"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=prospects&amp;type=p", $langs->trans("List"), 1, $user->rights->societe->lire);
if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);
if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);
@ -183,14 +239,14 @@ class MenuLeft {
if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=prospects&amp;type=p", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=prospects&amp;type=p", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
// Clients
$newmenu->add(DOL_URL_ROOT."/comm/index.php?leftmenu=customers", $langs->trans("Customers"), 0, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 1, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/clients.php?leftmenu=customers", $langs->trans("List"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=customers&amp;type=c", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&amp;type=c", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
// Contacts
$newmenu->add(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("Contacts"), 0, $user->rights->societe->lire);
@ -278,10 +334,10 @@ class MenuLeft {
{
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("NewSupplier"),1,$user->rights->societe->creer && $user->rights->fournisseur->lire);
}
$newmenu->add_submenu(DOL_URL_ROOT."/fourn/index.php?leftmenu=suppliers", $langs->trans("List"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/fourn/liste.php?leftmenu=suppliers", $langs->trans("List"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire);
if ($conf->societe->enabled)
{
$newmenu->add_submenu(DOL_URL_ROOT."/fourn/contact.php?leftmenu=suppliers",$langs->trans("Contacts"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=suppliers&amp;type=f",$langs->trans("Contacts"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire);
}
if ($conf->facture->enabled)
{

View File

@ -98,13 +98,15 @@ class MenuTop {
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a></td>';
// Members
if ($conf->adherent->enabled)
// Third parties
if (($conf->societe->enabled && $user->rights->societe->lire)
|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
{
$langs->load("members");
$langs->load("companies");
$langs->load("suppliers");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
{
$class='class="tmenu" id="sel"';
}
@ -113,9 +115,10 @@ class MenuTop {
$class = 'class="tmenu"';
}
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'</a></td>';
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a></td>';
}
// Products-Services
if ($conf->produit->enabled || $conf->service->enabled)
{
@ -141,24 +144,6 @@ class MenuTop {
print '<td class="tmenu"><font class="tmenudisabled">'.$chaine.'</font>';
}
// Supplier
if ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)
{
$langs->load("suppliers");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{
$class='class="tmenu" id="sel"';
}
else
{
$class = 'class="tmenu"';
}
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/fourn/index.php?mainmenu=suppliers&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").'</a></td>';
}
// Commercial
if ($conf->commercial->enabled)
{
@ -177,6 +162,25 @@ class MenuTop {
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
}
// Suppliers
if ($conf->fournisseur->enabled)
{
$langs->load("suppliers");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{
$class='class="tmenu" id="sel"';
}
else
{
$class = 'class="tmenu"';
}
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/fourn/index.php?mainmenu=suppliers&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").'</a></td>';
}
// Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled
@ -311,6 +315,24 @@ class MenuTop {
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/mantis/mantis.php?mainmenu=mantis"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("BugTracker").'</a></td>';
}
// Members
if ($conf->adherent->enabled)
{
$langs->load("members");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
{
$class='class="tmenu" id="sel"';
}
else
{
$class = 'class="tmenu"';
}
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'</a></td>';
}
print '</tr></table>';
}

View File

@ -4,6 +4,7 @@ ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one
ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
ErrorSetACountryFirst=Set the country first
ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited informations ?
MenuNewThirdParty=New third party
MenuNewCompany=New company
MenuNewCustomer=New customer
MenuNewProspect=New prospect
@ -20,6 +21,8 @@ Company=Company
CompanyName=Company name
Companies=Companies
ThirdParty=Third party
ThirdParties=Third parties
ThirdPartyAll=Third parties (all)
ThirdPartyProspects=Prospects
ThirdPartyCustomers=Customers
ThirdPartyCustomersWithIdProf12=Customers with %s or %s
@ -114,6 +117,7 @@ LastProspect=Last
ProspectToContact=Prospect to contact
CompanyDeleted=Company "%s" deleted from database.
ListOfContacts=List of contacts
ListOfProspectsContacts=List of prospect contacts
ListOfCustomersContacts=List of customer contacts
ListOfSuppliersContacts=List of supplier contacts
ListOfCompanies=List of companies
@ -174,7 +178,7 @@ NoRIB=No RIB defined
NoParentCompany=None
ExportImport=Import-Export
ExportCardToFormat=Export card to format
ContactNotLinkedToCompany=Contact not linked to any company
ContactNotLinkedToCompany=Contact not linked to any third party
DolibarrLogin=Dolibarr login
NoDolibarrAccess=No Dolibarr access
ExportDataset_company_1=Companies/fundations and properties

View File

@ -81,6 +81,5 @@ MyInformations=My informations
ExportDataset_user_1=Dolibarr's users and properties
DomainUser=Domain user
Reactivate=Reactivate
ThirdParty=Third party
CreateInternalUserDesc=This form allows you to creat an user internal to your company/fundation. To creat an external user (customer, supplier, ...), use button 'Create Dolibarr user' from third party's contact card.
InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/fundation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)

View File

@ -4,6 +4,7 @@ ErrorCompanyNameAlreadyExists=Le nom de soci
ErrorPrefixAlreadyExists=Le préfixe %s existe déjà. Veuillez en choisir un autre.
ErrorSetACountryFirst=Choisissez le pays d'abord
ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ?
MenuNewThirdParty=Nouveau tiers
MenuNewCompany=Nouvelle société
MenuNewCustomer=Nouveau client
MenuNewProspect=Nouveau prospect
@ -20,6 +21,8 @@ Company=Soci
CompanyName=Nom de société
Companies=Sociétés
ThirdParty=Tiers
ThirdParties=Tiers
ThirdPartyAll=Tiers (tous)
ThirdPartyProspects=Prospects
ThirdPartyCustomers=Clients
ThirdPartyCustomersWithIdProf12=Clients de %s ou %s
@ -108,6 +111,7 @@ LastProspect=Dernier prospect
ProspectToContact=Prospect à contacter
CompanyDeleted=La société "%s" a été supprimée de la base.
ListOfContacts=Liste des contacts
ListOfProspectsContacts=Liste des contacts prospects
ListOfCustomersContacts=Liste des contacts clients
ListOfSuppliersContacts=Liste des contacts fournisseurs
ListOfCompanies=Liste des sociétés
@ -165,7 +169,7 @@ NoRIB=Aucun RIB d
NoParentCompany=Aucune
ExportImport=Import/Export
ExportCardToFormat=Exporter la fiche au format
ContactNotLinkedToCompany=Contact lié à aucune société
ContactNotLinkedToCompany=Contact non lié à un tiers
DolibarrLogin=Login Dolibarr
NoDolibarrAccess=Pas d'accès à Dolibarr
ExportDataset_company_1=Entreprises/Fondations et propriétés

View File

@ -4,6 +4,7 @@ ErrorCompanyNameAlreadyExists=Le nom de soci
ErrorPrefixAlreadyExists=Le préfixe %s existe déjà. Veuillez en choisir un autre.
ErrorSetACountryFirst=Définissez d'abord le pays
ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ?
MenuNewThirdParty=Nouveau tiers
MenuNewCompany=Nouvelle société
MenuNewCustomer=Nouveau client
MenuNewProspect=Nouveau prospect
@ -20,6 +21,8 @@ Company=Soci
CompanyName=Raison sociale
Companies=Sociétés
ThirdParty=Tiers
ThirdParties=Tiers
ThirdPartyAll=Tiers (tous)
ThirdPartyProspects=Prospets
ThirdPartyCustomers=Clients
ThirdPartyCustomersWithIdProf12=Clients avec %s ou %s
@ -115,6 +118,7 @@ ProspectToContact=Prospect
CompanyDeleted=La société "%s" a été supprimée de la base.
ListOfContacts=Liste des contacts
ListOfCustomersContacts=Liste des contacts clients
ListOfProspectsContacts=Liste des contacts prospects
ListOfSuppliersContacts=Liste des contacts fournisseurs
ListOfCompanies=Liste des sociétés
ShowCompany=Afficher société
@ -174,7 +178,7 @@ NoRIB=Aucun RIB d
NoParentCompany=Aucune
ExportImport=Import-Export
ExportCardToFormat=Exporter fiche au format
ContactNotLinkedToCompany=Contact non lié à une société
ContactNotLinkedToCompany=Contact non lié à un tiers
DolibarrLogin=Login Dolibarr
NoDolibarrAccess=Pas d'accès Dolibarr
ExportDataset_company_1=Tiers (sociétés/institutions) et attributs

View File

@ -81,6 +81,5 @@ MyInformations=Mes informations
ExportDataset_user_1=Utilisateurs Dolibarr et attributs
DomainUser=Utilisateur du domaine
Reactivate=Réactiver
ThirdParty=Tiers
CreateInternalUserDesc=Cet écran permet de créer un utilisateur interne à votre société/institution. Pour créer un utilisateur externe (client, fournisseur, ...), utiliser le bouton 'Créer utilisateur Dolibarr' qui se trouve sur la fiche contact du tiers en question.
InternalExternalDesc=Un utilisateur <b>interne</b> est un utilisateur appartenant à votre société/institution.<br>Un utilisateur <b>externe</b> est un utilisateur client, fournisseur ou autre.<br><br>Dans les 2 cas, les permissions utilisateurs définissent les droits d'accès mais l'utilisateur externe peut en plus avoir un gestionnaire de menu différent de l'utilisateur interne (Voir Accueil - Configuration - Affichage)

View File

@ -318,7 +318,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
}
}
print '<tr><td>'.$load.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
print $soc->adresse;
print '</textarea></td></tr>';

View File

@ -173,13 +173,13 @@ div.tmenu
table.tmenu
{
padding: 0px 0px 10px 0px;
margin: 0px 0px 0px 10px;
margin: 0px 0px 0px 6px;
}
a.tmenu:link
{
color: #234046;
padding: 0px 8px 0px 8px;
padding: 0px 5px 0px 5px;
margin: 0px 1px 2px 1px;
font: 12px helvetica, verdana, arial, sans-serif;
font-weight: bold;
@ -187,7 +187,7 @@ a.tmenu:link
a.tmenu:visited
{
color: #234046;
padding: 0px 8px 0px 8px;
padding: 0px 5px 0px 5px;
margin: 0px 1px 2px 1px;
border: 0px solid #b3c5cc;
font: 12px helvetica, verdana, arial, sans-serif;
@ -196,7 +196,7 @@ a.tmenu:visited
a.tmenu#sel
{
color: #234046;
padding: 0px 8px 0px 8px;
padding: 0px 5px 0px 5px;
margin: 0px 0px 2px 0px;
font: 12px helvetica, verdana, arial, sans-serif;
font-weight: bold;
@ -209,7 +209,7 @@ a.tmenu#sel
a.tmenu:hover
{
color: #234046;
padding: 0px 8px 0px 8px;
padding: 0px 5px 0px 5px;
margin: 0px 1px 2px 1px;
text-decoration: none;
font: 12px helvetica, verdana, arial, sans-serif;
@ -220,7 +220,7 @@ a.tmenu:hover
font.tmenudisabled
{
color: #93a5aa;
padding: 0px 8px 0px 8px;
padding: 0px 5px 0px 5px;
margin: 0px 0px 2px 0px;
font-weight:bold;
font-size:12px;