Merge pull request #8932 from grandoc/new_branch_07_06_2018

New branch 07 06 2018
This commit is contained in:
Laurent Destailleur 2018-06-13 20:40:48 +02:00 committed by GitHub
commit dd8e39195d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions

View File

@ -205,7 +205,7 @@ if ($result > 0)
print_liste_field_titre('');
print "</tr>\n";
$var=false;
// $listofemails=$object->thirdparty_and_contact_email_array();
if ($object->email)
{
@ -277,7 +277,6 @@ if ($result > 0)
// List of active notifications
print_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
$var=true;
// Line with titles
print '<table width="100%" class="noborder">';
@ -299,7 +298,6 @@ if ($result > 0)
while ($i < $num)
{
$var = !$var;
$obj = $db->fetch_object($resql);

View File

@ -235,7 +235,6 @@ if ($action == 'edit')
clearstatcache();
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
@ -301,8 +300,6 @@ else
dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';