Fixed: Button at wrong place
This commit is contained in:
parent
06df952e57
commit
2db6258cb7
@ -1248,34 +1248,6 @@ if ($id > 0)
|
|||||||
|
|
||||||
if ($action != 'edit')
|
if ($action != 'edit')
|
||||||
{
|
{
|
||||||
|
|
||||||
if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
|
|
||||||
print '<div class="fichecenter"><div class="fichehalfleft">';
|
|
||||||
print '<a name="builddoc"></a>'; // ancre
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Documents generes
|
|
||||||
*/
|
|
||||||
|
|
||||||
$filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
|
|
||||||
$urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
|
|
||||||
|
|
||||||
$genallowed=$user->rights->agenda->myactions->create;
|
|
||||||
$delallowed=$user->rights->agenda->myactions->delete;
|
|
||||||
|
|
||||||
$var=true;
|
|
||||||
|
|
||||||
$somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);
|
|
||||||
|
|
||||||
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
|
|
||||||
|
|
||||||
|
|
||||||
print '</div></div></div>';
|
|
||||||
|
|
||||||
print '<div style="clear:both;"> </div>';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Link to agenda views
|
// Link to agenda views
|
||||||
print '<div id="agendaviewbutton">';
|
print '<div id="agendaviewbutton">';
|
||||||
print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
|
print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
|
||||||
@ -1315,6 +1287,33 @@ if ($id > 0)
|
|||||||
print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
|
print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
|
||||||
print '</form>'."\n";
|
print '</form>'."\n";
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
|
||||||
|
{
|
||||||
|
print '<div style="clear:both;"> </div><div class="fichecenter"><div class="fichehalfleft">';
|
||||||
|
print '<a name="builddoc"></a>'; // ancre
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Documents generes
|
||||||
|
*/
|
||||||
|
|
||||||
|
$filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
|
||||||
|
$urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
|
||||||
|
|
||||||
|
$genallowed=$user->rights->agenda->myactions->create;
|
||||||
|
$delallowed=$user->rights->agenda->myactions->delete;
|
||||||
|
|
||||||
|
$var=true;
|
||||||
|
|
||||||
|
$somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);
|
||||||
|
|
||||||
|
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
|
||||||
|
|
||||||
|
|
||||||
|
print '</div></div></div>';
|
||||||
|
|
||||||
|
print '<div style="clear:both;"> </div>';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user