diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 33e35c220f7..74dab9946e9 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -34,6 +34,7 @@ require_once("../contact.class.php"); require (DOL_DOCUMENT_ROOT."/lib/vcard/vcard.class.php"); $langs->load("companies"); +$langs->load("users"); $error = array(); @@ -180,7 +181,7 @@ if ($_GET["id"] > 0) $head[$h][1] = $langs->trans("Info"); $h++; - dolibarr_fiche_head($head, $hselected, $contact->firstname.' '.$contact->name); + dolibarr_fiche_head($head, $hselected, $langs->trans("Contact").": ".$contact->firstname.' '.$contact->name); } @@ -261,7 +262,9 @@ if ($_GET["action"] == 'create') print ''.$langs->trans("Note").''; - print 'Contact facturation'; + print 'Contact facturation'; + print $form->selectyesno("facturation",$contact->facturation); + print ''; print ''; print "
"; @@ -320,7 +323,9 @@ elseif ($_GET["action"] == 'edit') print nl2br($contact->note); print ''; - print 'Contact facturation'; + print 'Contact facturation'; + print $form->selectyesno("facturation"); + print ''; print ''; print "
"; @@ -382,15 +387,15 @@ else if ($contact->address || $contact->ville) { - print 'Adresse : '.$contact->address ."
"; - print 'Adresse : '.$contact->cp . " ".$contact->ville ."
"; + print 'Adresse :
'.$contact->address ."
"; + print $contact->cp . " ".$contact->ville ."
"; } if ($contact->jabberid) print 'Jabber : '.$contact->jabberid ."
"; if($contact->user_id) - print 'Utilisateur avec accés : Fiche utilisateur
'; + print $langs->trans("UserWithDolibarrAccess").': '.img_object($langs->trans("ShowUser"),"user").' '.$langs->trans("UserCard").'
'; print ''; diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 3625a4cf814..f2388afe773 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -58,7 +58,7 @@ $head[$h][1] = $langs->trans("Info"); $hselected=$h; $h++; -dolibarr_fiche_head($head, $hselected, $contact->firstname.' '.$contact->name); +dolibarr_fiche_head($head, $hselected, $langs->trans("Contact").": ".$contact->firstname.' '.$contact->name); /* * Visualisation de la fiche diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 75903370779..0aa9f76fb22 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -84,7 +84,7 @@ $head[$h][0] = DOL_URL_ROOT.'/contact/info.php?id='.$_GET["id"]; $head[$h][1] = $langs->trans("Info"); $h++; -dolibarr_fiche_head($head, $hselected, $contact->firstname.' '.$contact->name); +dolibarr_fiche_head($head, $hselected, $langs->trans("Contact").": ".$contact->firstname.' '.$contact->name); if ($_GET["action"] == 'edit') @@ -109,7 +109,7 @@ if ($_GET["action"] == 'edit') $html = new Form($db); - print 'Date de naissance'; + print ''.$langs->trans("Birthday").''; if ($contact->birthday && $contact->birthday > 0) { print $html->select_date($contact->birthday,'birthday',0,0,0); } else { @@ -117,7 +117,7 @@ if ($_GET["action"] == 'edit') } print ''; - print 'Alerte : '; + print ''.$langs->trans("Alert").': '; if ($contact->birthday_alert) { print ''; @@ -150,7 +150,7 @@ else } if ($contact->birthday && $contact->birthday > 0) { - print 'Date de naissance : '.dolibarr_print_date($contact->birthday); + print $langs->trans("Birthdate").' : '.dolibarr_print_date($contact->birthday); if ($contact->birthday_alert) print ' (alerte anniversaire active)
'; @@ -158,7 +158,7 @@ else print ' (alerte anniversaire inactive)
'; } else { - print 'Date de naissance : '.$langs->trans("Unknown")."
"; + print $langs->trans("Birthday").' : '.$langs->trans("Unknown")."
"; } print "
"; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 876a69f794e..c0be382f916 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -164,7 +164,7 @@ Drafts=Drafts Opened=Opened New=New Discount=Discount -Unknown=Inconnu +Unknown=Unknown General=General Size=Size Topic=Sujet diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 746a88ef58a..90a1cbe67db 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -40,4 +40,5 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non affected users UserModified=User modified successfully -PhotoFile=Fichier photo \ No newline at end of file +PhotoFile=Fichier photo +UserWithDolibarrAccess=User with Dolibarr access \ No newline at end of file diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index ceb9d638ff2..d016d1b7aec 100755 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -41,3 +41,4 @@ ShowUser=Afficher utilisateur NonAffectedUsers=Utilisateurs non affectés au groupe UserModified=Utilisateur modifié avec succès PhotoFile=Fichier photo +UserWithDolibarrAccess=Utilisateur avec accès Dolibarr \ No newline at end of file