diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 78322b2ecd2ca21bfffb32dad6f4f79dc4d7528a..f007695d6b895ea89724b233e5be3485ffc7bb1b 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 '<table class="border" width="100%"';
// Ref
- print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$act->id.'</td></tr>';
+ print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
+ print $form->showrefnav($act,'id','',($user->societe_id?0:1),'id','ref','');
+ print '</td></tr>';
// Type
print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
@@ -149,53 +153,115 @@ if ($objectid > 0)
// Title
print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$act->label.'</td></tr>';
- // Location
- print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$act->location.'</td></tr>';
+ // Full day event
+ print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($act->fulldayevent).'</td></tr>';
- // Societe - contact
- print '<tr><td>'.$langs->trans("Company").'</td><td>'.($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 "<br>".dol_print_phone($act->societe->tel);
- }
- }
+ // Date start
+ print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
+ 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 '</td>';
- print '<td>'.$langs->trans("Contact").'</td>';
- print '<td>';
- 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 "<br>".dol_print_phone($act->contact->phone_pro);
- }
- }
- }
- else
- {
- print $langs->trans("None");
- }
-
+ print '<td rowspan="3" align="center" valign="middle" width="180">'."\n";
+ print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="show_month">';
+ print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
+ print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
+ print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+ //print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+ print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" style="width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
+ print '</form>'."\n";
+ print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="show_week">';
+ print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
+ print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
+ print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+ //print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+ print img_picto($langs->trans("ViewCal"),'object_calendarweek').' <input type="submit" style="width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+ print '</form>'."\n";
+ print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="show_day">';
+ print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
+ print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
+ print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+ //print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+ print img_picto($langs->trans("ViewCal"),'object_calendarday').' <input type="submit" style="width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
+ print '</form>'."\n";
+ print '</td>';
+ print '</tr>';
+
+ // Date end
+ print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
+ 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 '</td></tr>';
- // Project
- if ($conf->projet->enabled)
- {
- print '<tr><td valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
- if ($act->fk_project)
- {
- $project=new Project($db);
- $project->fetch($act->fk_project);
- print $project->getNomUrl(1);
- }
- print '</td></tr>';
- }
+ // Status
+ print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">';
+ print $act->getLibStatut(4);
+ print '</td></tr>';
- print '</table><br><table class="border" width="100%">';
+ // Location
+ print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$act->location.'</td></tr>';
+
+
+ print '</table><br><table class="border" width="100%">';
+
+
+ // Third party - Contact
+ print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($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 "<br>".dol_print_phone($act->societe->tel);
+ }
+ }
+ print '</td>';
+ print '<td>'.$langs->trans("Contact").'</td>';
+ print '<td>';
+ 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 "<br>".dol_print_phone($act->contact->phone_pro);
+ }
+ }
+ }
+ else
+ {
+ print $langs->trans("None");
+ }
+
+ print '</td></tr>';
+
+ // Project
+ if ($conf->projet->enabled)
+ {
+ print '<tr><td valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
+ if ($act->fk_project)
+ {
+ $project=new Project($db);
+ $project->fetch($act->fk_project);
+ print $project->getNomUrl(1);
+ }
+ print '</td></tr>';
+ }
+
+ // Priority
+ print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
+ print ($act->priority?$act->priority:'');
+ print '</td></tr>';
+
+
+ print '</table><br><table class="border" width="100%">';
// 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 7aae59913ce62f274c8e86854be72247f6ff17df..7b90eab7aaa2d195efe70bc092efc7f1574f5354 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -493,23 +493,23 @@ if ($action == 'create')
print '</table>';
- print '<br>';
+ print '<br><br>';
print '<table class="border" width="100%">';
// Affected by
$var=false;
- print '<tr '.$bc[$var].'><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
+ print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
$form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):($actioncomm->usertodo->id > 0 ? $actioncomm->usertodo : $user),'affectedto',1);
print '</td></tr>';
// Realised by
- print '<tr '.$bc[$var].'><td nowrap>'.$langs->trans("ActionDoneBy").'</td><td>';
+ print '<tr><td nowrap>'.$langs->trans("ActionDoneBy").'</td><td>';
$form->select_users(GETPOST("doneby")?GETPOST("doneby"):($percent==100?$actioncomm->userdone:0),'doneby',1);
print '</td></tr>';
print '</table>';
- print '<br>';
+ print '<br><br>';
print '<table class="border" width="100%">';
// Societe, contact
@@ -717,25 +717,25 @@ if ($id)
// Location
print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$act->location.'"></td></tr>';
- print '</table><br><table class="border" width="100%">';
+ print '</table><br><br><table class="border" width="100%">';
// Input by
$var=false;
- print '<tr '.$bc[$var].'><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
+ print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
print $act->author->getNomUrl(1);
print '</td></tr>';
// Affected to
- print '<tr '.$bc[$var].'><td nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+ print '<tr><td nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
print $form->select_dolusers($act->usertodo->id>0?$act->usertodo->id:-1,'affectedto',1);
print '</td></tr>';
// Realised by
- print '<tr '.$bc[$var].'><td nowrap="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
+ print '<tr><td nowrap="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
print $form->select_dolusers($act->userdone->id> 0?$act->userdone->id:-1,'doneby',1);
print '</td></tr>';
- print '</table><br>';
+ print '</table><br><br>';
print '<table class="border" width="100%">';
@@ -864,26 +864,26 @@ if ($id)
// Location
print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$act->location.'</td></tr>';
- print '</table><br><table class="border" width="100%">';
+ print '</table><br><br><table class="border" width="100%">';
// Input by
$var=false;
- print '<tr '.$bc[$var].'><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
+ print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
if ($act->author->id > 0) print $act->author->getNomUrl(1);
else print ' ';
print '</td></tr>';
// Affecte a
- print '<tr '.$bc[$var].'><td nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+ print '<tr><td nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
if ($act->usertodo->id > 0) print $act->usertodo->getNomUrl(1);
print '</td></tr>';
// Done by
- print '<tr '.$bc[$var].'><td nowrap="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
+ print '<tr><td nowrap="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
if ($act->userdone->id > 0) print $act->userdone->getNomUrl(1);
print '</td></tr>';
- print '</table><br><table class="border" width="100%">';
+ print '</table><br><br><table class="border" width="100%">';
// Third party - Contact
print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($act->societe->id?$act->societe->getNomUrl(1):$langs->trans("None"));