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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-12-01 15:58:58 +01:00
commit c8f661021c
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/company.lib.php
View File

@ -842,8 +842,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
$colspan=9; $colspan=9;
if ($num || (GETPOST('button_search','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search_x','alpha')))
{
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
// Photo - Name // Photo - Name
@ -877,7 +875,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print '</td>'; print '</td>';
print "</tr>"; print "</tr>";
}
$titlefieldaddress=$langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email"); $titlefieldaddress=$langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email");
if (! empty($conf->dol_optimize_smallscreen)) $titlefieldaddress=$langs->trans("Address"); if (! empty($conf->dol_optimize_smallscreen)) $titlefieldaddress=$langs->trans("Address");