diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 78322b2ecd2..f007695d6b8 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -113,6 +113,8 @@ if ($_GET["action"] == 'delete') * View */ +$form = new Form($db); + $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'; llxHeader('',$langs->trans("Agenda"),$help_url); @@ -141,7 +143,9 @@ if ($objectid > 0) print ''; + print ''; // Type print ''; @@ -149,53 +153,115 @@ if ($objectid > 0) // Title print ''; - // Location - print ''; + // Full day event + print ''; - // Societe - contact - print ''; - print ''; - print ''; + print ''; + // Date end + print ''; - // Project - if ($conf->projet->enabled) - { - print ''; - } + // Status + print ''; - print '
'.$langs->trans("Ref").''.$act->id.'
'.$langs->trans("Ref").''; + print $form->showrefnav($act,'id','',($user->societe_id?0:1),'id','ref',''); + print '
'.$langs->trans("Type").''.$act->type.'
'.$langs->trans("Title").''.$act->label.'
'.$langs->trans("Location").''.$act->location.'
'.$langs->trans("EventOnFullDay").''.yn($act->fulldayevent).'
'.$langs->trans("Company").''.($act->societe->id?$act->societe->getNomUrl(1):$langs->trans("None")); - if ($act->societe->id && $act->type_code == 'AC_TEL') - { - if ($act->societe->fetch($act->societe->id)) - { - print "
".dol_print_phone($act->societe->tel); - } - } + // Date start + print '
'.$langs->trans("DateActionStart").''; + if (! $act->fulldayevent) print dol_print_date($act->datep,'dayhour'); + else print dol_print_date($act->datep,'day'); + if ($act->percentage == 0 && $act->datep && $act->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late")); print ''.$langs->trans("Contact").''; - if ($act->contact->id > 0) - { - print $act->contact->getNomUrl(1); - if ($act->contact->id && $act->type_code == 'AC_TEL') - { - if ($act->contact->fetch($act->contact->id)) - { - print "
".dol_print_phone($act->contact->phone_pro); - } - } - } - else - { - print $langs->trans("None"); - } + print '
'."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendar').' '; + print '
'."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarweek').' '; + print '
'."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarday').' '; + print '
'."\n"; + print '
'.$langs->trans("DateActionEnd").''; + if (! $act->fulldayevent) print dol_print_date($act->datef,'dayhour'); + else print dol_print_date($act->datef,'day'); + if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late")); print '
'.$langs->trans("Project").''; - if ($act->fk_project) - { - $project=new Project($db); - $project->fetch($act->fk_project); - print $project->getNomUrl(1); - } - print '
'.$langs->trans("Status").' / '.$langs->trans("Percentage").''; + print $act->getLibStatut(4); + print '

'; + // Location + print ''; + + + print '
'.$langs->trans("Location").''.$act->location.'

'; + + + // Third party - Contact + print ''; + print ''; + print ''; + + // Project + if ($conf->projet->enabled) + { + print ''; + } + + // Priority + print ''; + + + print '
'.$langs->trans("ActionOnCompany").''.($act->societe->id?$act->societe->getNomUrl(1):$langs->trans("None")); + if ($act->societe->id && $act->type_code == 'AC_TEL') + { + if ($act->societe->fetch($act->societe->id)) + { + print "
".dol_print_phone($act->societe->tel); + } + } + print '
'.$langs->trans("Contact").''; + if ($act->contact->id > 0) + { + print $act->contact->getNomUrl(1); + if ($act->contact->id && $act->type_code == 'AC_TEL') + { + if ($act->contact->fetch($act->contact->id)) + { + print "
".dol_print_phone($act->contact->phone_pro); + } + } + } + else + { + print $langs->trans("None"); + } + + print '
'.$langs->trans("Project").''; + if ($act->fk_project) + { + $project=new Project($db); + $project->fetch($act->fk_project); + print $project->getNomUrl(1); + } + print '
'.$langs->trans("Priority").''; + print ($act->priority?$act->priority:''); + print '

'; // Construit liste des fichiers $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 7aae59913ce..7b90eab7aaa 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -493,23 +493,23 @@ if ($action == 'create') print '
'; - print '
'; + print '

'; print ''; // Affected by $var=false; - print ''; // Realised by - print ''; print '
'.$langs->trans("ActionAffectedTo").''; + print '
'.$langs->trans("ActionAffectedTo").''; $form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):($actioncomm->usertodo->id > 0 ? $actioncomm->usertodo : $user),'affectedto',1); print '
'.$langs->trans("ActionDoneBy").''; + print '
'.$langs->trans("ActionDoneBy").''; $form->select_users(GETPOST("doneby")?GETPOST("doneby"):($percent==100?$actioncomm->userdone:0),'doneby',1); print '
'; - print '
'; + print '

'; print ''; // Societe, contact @@ -717,25 +717,25 @@ if ($id) // Location print ''; - print '
'.$langs->trans("Location").'

'; + print '


'; // Input by $var=false; - print ''; // Affected to - print ''; // Realised by - print ''; - print '
'.$langs->trans("ActionAskedBy").''; + print '
'.$langs->trans("ActionAskedBy").''; print $act->author->getNomUrl(1); print '
'.$langs->trans("ActionAffectedTo").''; + print '
'.$langs->trans("ActionAffectedTo").''; print $form->select_dolusers($act->usertodo->id>0?$act->usertodo->id:-1,'affectedto',1); print '
'.$langs->trans("ActionDoneBy").''; + print '
'.$langs->trans("ActionDoneBy").''; print $form->select_dolusers($act->userdone->id> 0?$act->userdone->id:-1,'doneby',1); print '

'; + print '

'; print ''; @@ -864,26 +864,26 @@ if ($id) // Location print ''; - print '
'.$langs->trans("Location").''.$act->location.'

'; + print '


'; // Input by $var=false; - print ''; // Affecte a - print ''; // Done by - print ''; - print '
'.$langs->trans("ActionAskedBy").''; + print '
'.$langs->trans("ActionAskedBy").''; if ($act->author->id > 0) print $act->author->getNomUrl(1); else print ' '; print '
'.$langs->trans("ActionAffectedTo").''; + print '
'.$langs->trans("ActionAffectedTo").''; if ($act->usertodo->id > 0) print $act->usertodo->getNomUrl(1); print '
'.$langs->trans("ActionDoneBy").''; + print '
'.$langs->trans("ActionDoneBy").''; if ($act->userdone->id > 0) print $act->userdone->getNomUrl(1); print '

'; + print '


'; // Third party - Contact print '
'.$langs->trans("ActionOnCompany").''.($act->societe->id?$act->societe->getNomUrl(1):$langs->trans("None"));