diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
index 15990bafbfd..c1acc782401 100644
--- a/htdocs/contact/exportimport.php
+++ b/htdocs/contact/exportimport.php
@@ -125,7 +125,7 @@ print '
| '.$langs->trans("UserTitle").' | ';
print $form->civilite_name($contact->civilite_id);
print ' |
';
-print '| '.$langs->trans("Lastname").' | '.$contact->name.' | ';
+print '
| '.$langs->trans("Lastname").' | '.$contact->name.' | ';
print ''.$langs->trans("Firstname").' | '.$contact->firstname.' |
';
print '';
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 9c3eaf050d4..2500a9c8163 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -409,10 +409,17 @@ if ($user->rights->societe->contact->creer)
$contact->load_ref_elements();
- if ($conf->facture->enabled)
+ if ($conf->commande->enabled)
{
- print '| '.$langs->trans("ContactForInvoices").' | ';
- print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice");
+ print ' |
| '.$langs->trans("ContactForOrders").' | ';
+ print $contact->ref_commande?$contact->ref_commande:$langs->trans("NoContactForAnyOrder");
+ print ' |
';
+ }
+
+ if ($conf->propal->enabled)
+ {
+ print '| '.$langs->trans("ContactForProposals").' | ';
+ print $contact->ref_propal?$contact->ref_propal:$langs->trans("NoContactForAnyProposal");
print ' |
';
}
@@ -423,6 +430,13 @@ if ($user->rights->societe->contact->creer)
print '';
}
+ if ($conf->facture->enabled)
+ {
+ print '| '.$langs->trans("ContactForInvoices").' | ';
+ print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice");
+ print ' |
';
+ }
+
print '| '.$langs->trans("DolibarrLogin").' | ';
if ($contact->user_id) print ''.$contact->user_login.'';
else print $langs->trans("NoDolibarrAccess");
@@ -462,7 +476,7 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
print $form->civilite_name($contact->civilite_id);
print ' |
';
- print '| '.$langs->trans("Lastname").' | '.$contact->name.' | ';
+ print '
| '.$langs->trans("Lastname").' | '.$contact->name.' | ';
print ''.$langs->trans("Firstname").' | '.$contact->firstname.' |
';
print '| Poste/Fonction | '.$contact->poste.' | ';
@@ -512,10 +526,17 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
$contact->load_ref_elements();
- if ($conf->facture->enabled)
+ if ($conf->commande->enabled)
{
- print '
| '.$langs->trans("ContactForInvoices").' | ';
- print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice");
+ print ' |
| '.$langs->trans("ContactForOrders").' | ';
+ print $contact->ref_commande?$contact->ref_commande:$langs->trans("NoContactForAnyOrder");
+ print ' |
';
+ }
+
+ if ($conf->propal->enabled)
+ {
+ print '| '.$langs->trans("ContactForProposals").' | ';
+ print $contact->ref_propal?$contact->ref_propal:$langs->trans("NoContactForAnyProposal");
print ' |
';
}
@@ -526,6 +547,13 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
print '';
}
+ if ($conf->facture->enabled)
+ {
+ print '| '.$langs->trans("ContactForInvoices").' | ';
+ print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice");
+ print ' |
';
+ }
+
print '| '.$langs->trans("DolibarrLogin").' | ';
if ($contact->user_id) print ''.$contact->user_login.'';
else print $langs->trans("NoDolibarrAccess");
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index f0213d26141..5bdca60e4ab 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -143,11 +143,11 @@ if ($_GET["action"] == 'edit')
$objsoc = new Societe($db);
$objsoc->fetch($contact->socid);
- print ' |
| '.$langs->trans("Company").' | '.$objsoc->getNomUrl(1).' | ';
+ print '
| '.$langs->trans("Company").' | '.$objsoc->getNomUrl(1).' | ';
}
else
{
- print '
| '.$langs->trans("Company").' | ';
+ print ' |
| '.$langs->trans("Company").' | ';
print $langs->trans("ContactNotLinkedToCompany");
print ' |
';
}
@@ -156,7 +156,7 @@ if ($_GET["action"] == 'edit')
print $form->civilite_name($contact->civilite_id);
print '';
- print '| '.$langs->trans("Lastname").' | '.$contact->nom.' | ';
+ print '
| '.$langs->trans("Lastname").' | '.$contact->nom.' | ';
print ''.$langs->trans("Firstname").' | '.$contact->prenom.' | ';
@@ -198,12 +198,12 @@ else
$objsoc = new Societe($db);
$objsoc->fetch($contact->socid);
- print '
| '.$langs->trans("Company").' | '.$objsoc->getNomUrl(1).' |
';
+ print '| '.$langs->trans("Company").' | '.$objsoc->getNomUrl(1).' |
';
}
else
{
- print '| '.$langs->trans("Company").' | ';
+ print ' |
| '.$langs->trans("Company").' | ';
print $langs->trans("ContactNotLinkedToCompany");
print ' |
';
}
@@ -212,7 +212,7 @@ else
print $form->civilite_name($contact->civilite_id);
print '';
- print '| '.$langs->trans("Lastname").' | '.$contact->name.' | ';
+ print '
| '.$langs->trans("Lastname").' | '.$contact->name.' | ';
print ''.$langs->trans("Firstname").' | '.$contact->firstname.' |
';
if ($contact->birthday && $contact->birthday > 0) {
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 3948516cc05..c9cc7368409 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -108,10 +108,14 @@ ShowCompany=Show company
ShowContact=Show contact
ContactsAllShort=All
ContactType=Contact type
-ContactForInvoices=Invoices' contact
+ContactForOrders=Orders' contact
+ContactForProposals=Proposals' contact
ContactForContracts=Contracts' contact
-NoContactForAnyInvoice=This contact is not contact for any invoice
+ContactForInvoices=Invoices' contact
+NoContactForAnyOrder=This contact is not contact for any order
+NoContactForAnyProposal=This contact is not contact for any commercial proposal
NoContactForAnyContract=This contact is not contact for any contract
+NoContactForAnyInvoice=This contact is not contact for any invoice
NewContact=New contact
LastContacts=Last contacts
MyContacts=My contacts
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 992e2918a0b..72b79a6bbd9 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -108,10 +108,14 @@ ShowCompany=Afficher soci
ShowContact=Afficher contact
ContactsAllShort=Tous
ContactType=Type de contact
-ContactForInvoices=Contact de factures
+ContactForOrders=Contact de commandes
+ContactForProposals=Contact de propositions
ContactForContracts=Contact de contrats
-NoContactForAnyInvoice=Ce contact n'est contact d'aucune facture
+ContactForInvoices=Contact de factures
+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
LastContacts=Derniers contacts
MyContacts=Mes contacts