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

Fix: Missing tr line

Browse Source
This commit is contained in:
Laurent Destailleur 2013-07-23 15:26:35 +02:00
parent 2e7205f309
commit cbeeb463e2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.formfile.class.php
View File

@ -554,9 +554,13 @@ class FormFile
$out .= $hookmanager->resPrint; $out .= $hookmanager->resPrint;
} }
} }
$out.= '</tr>';
} }
$out.= '</tr>'; if (count($file_list) == 0)
{
$out.='<tr><td colspan="3">'.$langs->trans("None").'</td></tr>';
}
$this->numoffiles++; $this->numoffiles++;
} }

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

@ -536,7 +536,9 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print "\n".'<table class="noborder" width="100%">'."\n"; print "\n".'<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre"><td>'.$langs->trans("Name").'</td>'; $colspan=6;
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Poste").'</td>'; print '<td>'.$langs->trans("Poste").'</td>';
print '<td>'.$langs->trans("PhonePro").'</td>'; print '<td>'.$langs->trans("PhonePro").'</td>';
print '<td>'.$langs->trans("PhoneMobile").'</td>'; print '<td>'.$langs->trans("PhoneMobile").'</td>';
@ -545,6 +547,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
{ {
$colspan++;
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
} }
print "</tr>"; print "</tr>";
@ -622,9 +625,9 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
} }
else else
{ {
//print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
//print '<td>'.$langs->trans("NoContactsYetDefined").'</td>'; print '<td colspan="'.$colspan.'">'.$langs->trans("None").'</td>';
//print "</tr>\n"; print "</tr>\n";
} }
print "\n</table>\n"; print "\n</table>\n";