Merge pull request #8932 from grandoc/new_branch_07_06_2018
New branch 07 06 2018
This commit is contained in:
commit
dd8e39195d
@ -205,7 +205,7 @@ if ($result > 0)
|
|||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$var=false;
|
|
||||||
// $listofemails=$object->thirdparty_and_contact_email_array();
|
// $listofemails=$object->thirdparty_and_contact_email_array();
|
||||||
if ($object->email)
|
if ($object->email)
|
||||||
{
|
{
|
||||||
@ -277,7 +277,6 @@ if ($result > 0)
|
|||||||
|
|
||||||
// List of active notifications
|
// List of active notifications
|
||||||
print_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
|
print_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
|
||||||
$var=true;
|
|
||||||
|
|
||||||
// Line with titles
|
// Line with titles
|
||||||
print '<table width="100%" class="noborder">';
|
print '<table width="100%" class="noborder">';
|
||||||
@ -299,7 +298,6 @@ if ($result > 0)
|
|||||||
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$var = !$var;
|
|
||||||
|
|
||||||
$obj = $db->fetch_object($resql);
|
$obj = $db->fetch_object($resql);
|
||||||
|
|
||||||
|
|||||||
@ -235,7 +235,6 @@ if ($action == 'edit')
|
|||||||
|
|
||||||
|
|
||||||
clearstatcache();
|
clearstatcache();
|
||||||
$var=true;
|
|
||||||
|
|
||||||
print '<table class="noborder" width="100%">';
|
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> </td><td>'.$langs->trans("PersonalValue").'</td></tr>';
|
print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td> </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);
|
dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
|
||||||
|
|
||||||
$var=true;
|
|
||||||
|
|
||||||
print '<table class="noborder" width="100%">';
|
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> </td><td>'.$langs->trans("PersonalValue").'</td></tr>';
|
print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td> </td><td>'.$langs->trans("PersonalValue").'</td></tr>';
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user