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

Fix: Wrong order of name/firstname

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-09 18:27:56 +00:00
parent f3611f04c8
commit 7e1e28f0d8
9 changed files with 122 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/comm/propal/contact.php
View File

@ -153,6 +153,7 @@ llxHeader('', $langs->trans("Proposal"), "Propal");
$html = new Form($db); $html = new Form($db);
$formcompany= new FormCompany($db); $formcompany= new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db);
/* *************************************************************************** */ /* *************************************************************************** */
@ -350,16 +351,20 @@ if ($id > 0 || ! empty($ref))
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
} $userstatic->prenom=$tab[$i]['firstname'];
if ($tab[$i]['source']=='external') print $userstatic->getNomUrl(1);
{ }
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; if ($tab[$i]['source']=='external')
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; {
} $contactstatic->id=$tab[$i]['id'];
$contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
}
print '</td>'; print '</td>';
// Type de contact // Type de contact

25
htdocs/commande/contact.php
View File

@ -154,6 +154,7 @@ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES
$html = new Form($db); $html = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db);
/* *************************************************************************** */ /* *************************************************************************** */
@ -347,16 +348,20 @@ if ($id > 0 || ! empty($ref))
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
} $userstatic->prenom=$tab[$i]['firstname'];
if ($tab[$i]['source']=='external') print $userstatic->getNomUrl(1);
{ }
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; if ($tab[$i]['source']=='external')
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; {
} $contactstatic->id=$tab[$i]['id'];
$contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
}
print '</td>'; print '</td>';
// Type de contact // Type de contact

21
htdocs/compta/facture/contact.php
View File

@ -152,6 +152,7 @@ llxHeader('', $langs->trans("Bill"), "Facture");
$html = new Form($db); $html = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db);
/* *************************************************************************** */ /* *************************************************************************** */
@ -342,15 +343,19 @@ if ($id > 0 || ! empty($ref))
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
$userstatic->prenom=$tab[$i]['firstname'];
print $userstatic->getNomUrl(1);
} }
if ($tab[$i]['source']=='external') if ($tab[$i]['source']=='external')
{ {
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; $contactstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; $contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
} }
print '</td>'; print '</td>';

21
htdocs/contrat/contact.php
View File

@ -153,6 +153,7 @@ llxHeader('', $langs->trans("ContractCard"), "Contrat");
$html = new Form($db); $html = new Form($db);
$formcompany= new FormCompany($db); $formcompany= new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db);
/* *************************************************************************** */ /* *************************************************************************** */
@ -346,15 +347,19 @@ if ($id > 0)
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
$userstatic->prenom=$tab[$i]['firstname'];
print $userstatic->getNomUrl(1);
} }
if ($tab[$i]['source']=='external') if ($tab[$i]['source']=='external')
{ {
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; $contactstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; $contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
} }
print '</td>'; print '</td>';

25
htdocs/fichinter/contact.php
View File

@ -152,6 +152,7 @@ llxHeader();
$html = new Form($db); $html = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db);
/* *************************************************************************** */ /* *************************************************************************** */
@ -332,16 +333,20 @@ if ($id > 0)
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
} $userstatic->prenom=$tab[$i]['firstname'];
if ($tab[$i]['source']=='external') print $userstatic->getNomUrl(1);
{ }
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; if ($tab[$i]['source']=='external')
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; {
} $contactstatic->id=$tab[$i]['id'];
$contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
}
print '</td>'; print '</td>';
// Type de contact // Type de contact

25
htdocs/fourn/commande/contact.php
View File

@ -154,6 +154,7 @@ llxHeader('', $langs->trans("Order"), "Commande");
$html = new Form($db); $html = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db);
/* *************************************************************************** */ /* *************************************************************************** */
@ -339,16 +340,20 @@ if ($id > 0 || ! empty($ref))
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
} $userstatic->prenom=$tab[$i]['firstname'];
if ($tab[$i]['source']=='external') print $userstatic->getNomUrl(1);
{ }
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; if ($tab[$i]['source']=='external')
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; {
} $contactstatic->id=$tab[$i]['id'];
$contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
}
print '</td>'; print '</td>';
// Type de contact // Type de contact

21
htdocs/fourn/facture/contact.php
View File

@ -154,6 +154,7 @@ llxHeader('', $langs->trans("Bill"), "Facture");
$html = new Form($db); $html = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db);
/* *************************************************************************** */ /* *************************************************************************** */
@ -332,15 +333,19 @@ if ($id > 0)
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
$userstatic->prenom=$tab[$i]['firstname'];
print $userstatic->getNomUrl(1);
} }
if ($tab[$i]['source']=='external') if ($tab[$i]['source']=='external')
{ {
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; $contactstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; $contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
} }
print '</td>'; print '</td>';

13
htdocs/projet/contact.php
View File

@ -158,7 +158,6 @@ llxHeader('', $langs->trans("Project"), $help_url);
$html = new Form($db); $html = new Form($db);
$formcompany= new FormCompany($db); $formcompany= new FormCompany($db);
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$userstatic=new User($db); $userstatic=new User($db);
@ -366,13 +365,17 @@ if ($id > 0 || ! empty($ref))
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
$userstatic->prenom=$tab[$i]['firstname'];
print $userstatic->getNomUrl(1);
} }
if ($tab[$i]['source']=='external') if ($tab[$i]['source']=='external')
{ {
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; $contactstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; $contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
} }
print '</td>'; print '</td>';

25
htdocs/projet/tasks/contact.php
View File

@ -159,6 +159,7 @@ llxHeader('', $langs->trans("Task"));
$html = new Form($db); $html = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$contactstatic = new Contact($db); $contactstatic = new Contact($db);
$userstatic = new User($db);
$project = new Project($db); $project = new Project($db);
@ -363,16 +364,20 @@ if ($id > 0 || ! empty($ref))
// Contact // Contact
print '<td>'; print '<td>';
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$tab[$i]['id'].'">'; $userstatic->id=$tab[$i]['id'];
print img_object($langs->trans("ShowUser"),"user").' '.$tab[$i]['nom'].'</a>'; $userstatic->nom=$tab[$i]['nom'];
} $userstatic->prenom=$tab[$i]['firstname'];
if ($tab[$i]['source']=='external') print $userstatic->getNomUrl(1);
{ }
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$tab[$i]['id'].'">'; if ($tab[$i]['source']=='external')
print img_object($langs->trans("ShowContact"),"contact").' '.$tab[$i]['nom'].'</a>'; {
} $contactstatic->id=$tab[$i]['id'];
$contactstatic->name=$tab[$i]['nom'];
$contactstatic->firstname=$tab[$i]['firstname'];
print $contactstatic->getNomUrl(1);
}
print '</td>'; print '</td>';
// Type de contact // Type de contact