diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index c8f71e48403..194286a04b7 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -210,6 +210,8 @@ if ($id > 0 || ! empty($ref))
print '';
+
+
/*
* Lignes de contacts
*/
@@ -217,7 +219,7 @@ if ($id > 0 || ! empty($ref))
/*
* Ajouter une ligne de contact
- * Non affich� en mode modification de ligne
+ * Non affiche en mode modification de ligne
*/
if ($_GET["action"] != 'editline' && $user->rights->propale->creer)
{
@@ -298,7 +300,7 @@ if ($id > 0 || ! empty($ref))
print '
| |
';
}
- // Liste des contacts li�s
+ // Liste des contacts lies
print '';
print '| '.$langs->trans("Source").' | ';
print ''.$langs->trans("Company").' | ';
@@ -308,7 +310,7 @@ if ($id > 0 || ! empty($ref))
print ' | ';
print "
\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -334,7 +336,7 @@ if ($id > 0 || ! empty($ref))
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 0dee86c208d..10e2aa00ea2 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -307,7 +307,7 @@ if ($id > 0 || ! empty($ref))
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic=new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -333,7 +333,7 @@ if ($id > 0 || ! empty($ref))
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 02c320981ba..7210e60e773 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -302,7 +302,7 @@ if ($id > 0 || ! empty($ref))
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -328,7 +328,7 @@ if ($id > 0 || ! empty($ref))
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index e8d99f71d98..819a016bba8 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -306,7 +306,7 @@ if ($id > 0)
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -332,7 +332,7 @@ if ($id > 0)
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 3073764165e..422fce2b8bd 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -292,7 +292,7 @@ if ($id > 0)
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -318,7 +318,7 @@ if ($id > 0)
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 868429e7b03..8663a821ac8 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -299,7 +299,7 @@ if ($id > 0 || ! empty($ref))
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -325,7 +325,7 @@ if ($id > 0 || ! empty($ref))
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index e2ebc0024b9..050f2058d8a 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -291,7 +291,7 @@ if ($id > 0)
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -317,7 +317,7 @@ if ($id > 0)
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 2ffbf8f47f5..bef003cfea5 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -316,7 +316,7 @@ if ($id > 0 || ! empty($ref))
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -342,7 +342,7 @@ if ($id > 0 || ! empty($ref))
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 33121f9fedd..6e66ac78256 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -319,7 +319,7 @@ if ($id > 0 || ! empty($ref))
print ' | ';
print "\n";
- $societe = new Societe($db);
+ $companystatic = new Societe($db);
$var = true;
foreach(array('internal','external') as $source)
@@ -345,7 +345,7 @@ if ($id > 0 || ! empty($ref))
if ($tab[$i]['socid'] > 0)
{
print '';
- print img_object($langs->trans("ShowCompany"),"company").' '.$societe->get_nom($tab[$i]['socid']);
+ print img_object($langs->trans("ShowCompany"),"company").' '.$companystatic->get_nom($tab[$i]['socid']);
print '';
}
if ($tab[$i]['socid'] < 0)