lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: different trad if addresses management

Browse Source
This commit is contained in:
Regis Houssin 2012-03-14 15:32:48 +01:00
parent b1de2aced2
commit 551b9c619a
8 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/comm/contact.php
View File

@ -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 '<table class="liste" width="100%">';
print '<tr class="liste_titre">';

6
htdocs/contact/canvas/default/actions_contactcard_default.class.php
View File

@ -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;
}

5
htdocs/contact/fiche.php
View File

@ -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)

23
htdocs/contact/list.php
View File

@ -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&oacute;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&oacute;dulo_Empresas');
$form=new Form($db);

4
htdocs/core/menus/standard/eldy.lib.php
View File

@ -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&amp;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&amp;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);

5
htdocs/fourn/contact.php
View File

@ -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 '<table class="liste" width="100%">';
print '<tr class="liste_titre">';

3
htdocs/langs/en_US/companies.lang
View File

@ -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

6
htdocs/langs/fr_FR/companies.lang
View File

@ -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