diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 38c20e438a6..4e74ec1c293 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -125,8 +125,9 @@ $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); - - print_barre_liste($langs->trans("ListOfContacts").($label?" (".$label.")":""),$page, $_SERVER["PHP_SELF"], "&type=$type",$sortfield,$sortorder,"",$num); + + $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); + print_barre_liste($title.($label?" (".$label.")":""),$page, $_SERVER["PHP_SELF"], "&type=$type",$sortfield,$sortorder,"",$num); print ''; print ''; diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index 4230d8bbe38..fdaa07825ef 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -62,9 +62,9 @@ class ActionsContactCardDefault extends ActionsContactCardCommon $out=''; - if ($action == 'view') $out.= $langs->trans("Contact"); - if ($action == 'edit') $out.= $langs->trans("EditContact"); - if ($action == 'create') $out.= $langs->trans("NewContact"); + if ($action == 'view') $out.= (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contact") : $langs->trans("ContactAddress")); + if ($action == 'edit') $out.= (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("EditContact") : $langs->trans("EditContactAddress")); + if ($action == 'create') $out.= (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")); return $out; } diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 6849cb1c145..0431f65f993 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -324,8 +324,9 @@ else // Show tabs $head = contact_prepare_head($object); - - dol_fiche_head($head, 'card', $langs->trans("ContactsAddresses"), 0, 'contact'); + + $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")); + dol_fiche_head($head, 'card', $title, 0, 'contact'); } if ($user->rights->societe->contact->creer) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index eb047e0b0a0..b6723bb6623 100755 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -62,29 +62,31 @@ $limit = $conf->liste_limit; $offset = $limit * $page; $langs->load("companies"); -$titre=$langs->trans("ListOfContacts"); +$titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); if ($type == "c") { - $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')'; + $titre.=' ('.$langs->trans("ThirdPartyCustomers").')'; $urlfiche="fiche.php"; } -if ($type == "p") +else if ($type == "p") { - $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyProspects").')'; + $titre.=' ('.$langs->trans("ThirdPartyProspects").')'; $urlfiche="prospect/fiche.php"; } -if ($type == "f") { - $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartySuppliers").')'; +else if ($type == "f") +{ + $titre.=' ('.$langs->trans("ThirdPartySuppliers").')'; $urlfiche="fiche.php"; } -if ($type == "o") { - $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("OthersNotLinkedToThirdParty").')'; +else if ($type == "o") +{ + $titre.=' ('.$langs->trans("OthersNotLinkedToThirdParty").')'; $urlfiche=""; } if ($view == 'phone') { $text=" (Vue Telephones)"; } if ($view == 'mail') { $text=" (Vue EMail)"; } if ($view == 'recent') { $text=" (Recents)"; } -$titre = $titre." $text"; +$titre.= " $text"; if ($_POST["button_removefilter"]) { @@ -109,7 +111,8 @@ if ($search_priv < 0) $search_priv=''; * View */ -llxHeader('',$langs->trans("ContactsAddresses"),'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas'); +$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")); +llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas'); $form=new Form($db); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index d9d95d5157b..d2d4976f07d 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -760,8 +760,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) } // Contacts - $newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("ContactsAddresses"), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts'); - $newmenu->add("/contact/fiche.php?leftmenu=contacts&action=create", $langs->trans("NewContact"), 1, $user->rights->societe->contact->creer); + $newmenu->add("/contact/list.php?leftmenu=contacts", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts'); + $newmenu->add("/contact/fiche.php?leftmenu=contacts&action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer); $newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire); if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire); $newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire); diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 68eb0bcbb3f..19d8d0cd01e 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -91,8 +91,9 @@ $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); - - print_barre_liste($langs->trans("ListOfContacts")." (".$langs->trans("Suppliers").")",$page, "contact.php", "",$sortfield,$sortorder,"",$num); + + $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); + print_barre_liste($title." (".$langs->trans("Suppliers").")",$page, "contact.php", "",$sortfield,$sortorder,"",$num); print '
'; print ''; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 514b681e3fb..9aa346d7bad 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -269,7 +269,8 @@ NoContactForAnyOrder=This contact is not a contact for any order NoContactForAnyProposal=This contact is not a contact for any commercial proposal NoContactForAnyContract=This contact is not a contact for any contract NoContactForAnyInvoice=This contact is not a contact for any invoice -NewContact=New contact/address +NewContact=New contact +NewContactAddress=New contact/address LastContacts=Last contacts MyContacts=My contacts Phones=Phones diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index d1154220df4..f508a6b351d 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -252,7 +252,8 @@ ThisIsModuleRules=Voici les règles de ce module LastProspect=Dernier prospect ProspectToContact=Prospect à contacter CompanyDeleted=La société "%s" a été supprimée de la base. -ListOfContacts=Liste des contacts/adresses +ListOfContacts=Liste des contacts +ListOfContactsAddresses=Liste des contacts/adresses ListOfCustomersContacts=Liste des contacts clients ListOfProspectsContacts=Liste des contacts prospects ListOfSuppliersContacts=Liste des contacts fournisseurs @@ -270,7 +271,8 @@ NoContactForAnyOrder=Ce contact n'est contact d'aucune commande NoContactForAnyProposal=Ce contact n'est contact d'aucune proposition commerciale NoContactForAnyContract=Ce contact n'est contact d'aucun contrat NoContactForAnyInvoice=Ce contact n'est contact d'aucune facture -NewContact=Nouveau contact/adresse +NewContact=Nouveau contact +NewContactAddress=Nouveau contact/adresse LastContacts=Derniers contacts MyContacts=Mes contacts Phones=Téléphones