diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 1a8d0987e3b..c0591960058 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -786,11 +786,6 @@ if ($id > 0) } } - /*if ($user->rights->societe->contact->creer) - { - print ''.$langs->trans("AddContact").''; - }*/ - print ''; print "
\n"; diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 020cc203f10..c3c11d8f7c8 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -312,8 +312,6 @@ if ($socid > 0) } } - //print ''.$langs->trans("AddContact").''; - print ''; print '
'; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 0fb3a29af78..6849cb1c145 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -349,8 +349,9 @@ else $object->country_code = $tmparray['code']; $object->country = $tmparray['label']; } - - print_fiche_titre($langs->trans("AddContact")); + + $title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); + print_fiche_titre($title); // Affiche les erreurs dol_htmloutput_errors($error,$errors); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c6cf2ce9149..cdde6a0dab0 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2644,8 +2644,9 @@ class Form $num=$this->select_contacts($societe->id, $selected, $htmlname); if ($num==0) { + $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); print 'Cette societe n\'a pas de contact, veuillez en cr�er un avant de faire votre proposition commerciale
'; - print ''.$langs->trans('AddContact').''; + print ''.$addcontact.''; } print ''; print ''; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 5a3e62c61dc..7e65d711f0b 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -502,12 +502,14 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $buttoncreate=''; if ($user->rights->societe->contact->creer) { - //$buttoncreate=''.$langs->trans("AddContact").''."\n"; - $buttoncreate=''.$langs->trans("AddContact").' '.img_picto($langs->trans("AddContact"),'filenew').''."\n"; + $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); + $buttoncreate=''.$addcontact.' '.img_picto($addcontact,'filenew').''."\n"; } print "\n"; - print_fiche_titre($langs->trans("ContactsForCompany"),$buttoncreate,''); + + $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany")); + print_fiche_titre($title,$buttoncreate,''); print "\n".''."\n"; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index abf566aab22..97548155956 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -394,11 +394,6 @@ if ($object->fetch($id)) } } - /*if ($user->rights->societe->contact->creer) - { - print "".$langs->trans("AddContact").""; - }*/ - print ''; print '
'; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index a201b4c1140..514b681e3fb 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -225,8 +225,10 @@ AvailableGlobalDiscounts=Absolute discounts available DiscountNone=None Supplier=Supplier CompanyList=Company's list -AddContact=Add contact/address -EditContact=Edit contact/address +AddContact=Add contact +AddContactAddress=Add contact/address +EditContact=Edit contact +EditContactAddress=Edit contact/address Contact=Contact ContactsAddresses=Contacts/Addresses NoContactDefined=No contact defined for this third party diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 1e5cd76c8e4..e2b65f8799f 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -328,7 +328,8 @@ ActionRunningNotStarted=To start ActionRunningShort=Started ActionDoneShort=Finished CompanyFoundation=Company/Foundation -ContactsForCompany=Contacts/adresses for this third party +ContactsForCompany=Contacts for this third party +ContactsAddressesForCompany=Contacts/adresses for this third party ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index ac87523b756..d1154220df4 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -227,8 +227,10 @@ AvailableGlobalDiscounts=Remises fixes disponibles DiscountNone=Aucune Supplier=Fournisseur CompanyList=Liste des sociétés -AddContact=Créer contact/adresse -EditContact=Editer contact/adresse +AddContact=Créer contact +AddContactAddress=Créer contact/adresse +EditContact=Editer contact +EditContactAddress=Editer contact/adresse Contact=Contact NoContactDefined=Aucun contact défini pour ce tiers DefaultContact=Contact par défaut diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 778e771ce13..5dbc286f0ab 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -329,7 +329,8 @@ ActionRunningNotStarted=A réaliser ActionRunningShort=En cours ActionDoneShort=Terminé CompanyFoundation=Société ou institution -ContactsForCompany=Contacts/adresses de ce tiers +ContactsForCompany=Contacts de ce tiers +ContactsAddressesForCompany=Contacts/adresses de ce tiers ActionsOnCompany=Événements vis à vis de ce tiers ActionsOnMember=Événements vis à vis de cet adhérent NActions=%s événements diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php index a632b9cac7a..3398cdccead 100644 --- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php @@ -241,10 +241,6 @@ for ($i=1; $i<=4; $i++) { ">trans("Modify"); ?> -rights->societe->contact->creer) { ?> -trans("AddContact"); ?> - - rights->societe->supprimer) { ?> use_javascript_ajax) { ?> trans('Delete'); ?> diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php index 51c1ae32ae2..6da431fb799 100644 --- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php @@ -182,10 +182,6 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); ">trans("Modify"); ?> -rights->societe->contact->creer) { ?> -trans("AddContact"); ?> - - rights->societe->supprimer) { ?> use_javascript_ajax) { ?> trans('Delete'); ?>