diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index dd9cd857bf5..8d1a4c20ac9 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -65,12 +65,12 @@ $error=GETPOST("error");
 $mesg='';
 
 $cactioncomm = new CActionComm($db);
-$actioncomm = new ActionComm($db);
+$object = new ActionComm($db);
 $contact = new Contact($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($actioncomm->table_element);
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
 //var_dump($_POST);
 
@@ -139,65 +139,65 @@ if ($action == 'add_action')
 	}
 
 	// Initialisation objet actioncomm
-	$actioncomm->type_id = $cactioncomm->id;
-	$actioncomm->type_code = $cactioncomm->code;
-	$actioncomm->priority = GETPOST("priority")?GETPOST("priority"):0;
-	$actioncomm->fulldayevent = (! empty($fulldayevent)?1:0);
-	$actioncomm->location = GETPOST("location");
-	$actioncomm->transparency = (GETPOST("transparency")=='on'?1:0);
-	$actioncomm->label = trim(GETPOST('label'));
-	$actioncomm->fk_element = GETPOST("fk_element");
-	$actioncomm->elementtype = GETPOST("elementtype");
+	$object->type_id = $cactioncomm->id;
+	$object->type_code = $cactioncomm->code;
+	$object->priority = GETPOST("priority")?GETPOST("priority"):0;
+	$object->fulldayevent = (! empty($fulldayevent)?1:0);
+	$object->location = GETPOST("location");
+	$object->transparency = (GETPOST("transparency")=='on'?1:0);
+	$object->label = trim(GETPOST('label'));
+	$object->fk_element = GETPOST("fk_element");
+	$object->elementtype = GETPOST("elementtype");
 	if (! GETPOST('label'))
 	{
 		if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs))
 		{
-			$actioncomm->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
+			$object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
 		}
 		else
 		{
-			if ($langs->trans("Action".$actioncomm->type_code) != "Action".$actioncomm->type_code)
+			if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
 			{
-				$actioncomm->label = $langs->transnoentitiesnoconv("Action".$actioncomm->type_code)."\n";
+				$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
 			}
-			else $actioncomm->label = $cactioncomm->libelle;
+			else $object->label = $cactioncomm->libelle;
 		}
 	}
-	$actioncomm->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
-	$actioncomm->datep = $datep;
-	$actioncomm->datef = $datef;
-	$actioncomm->percentage = $percentage;
-	$actioncomm->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
+	$object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
+	$object->datep = $datep;
+	$object->datef = $datef;
+	$object->percentage = $percentage;
+	$object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
 
 	$usertodo=new User($db);
 	if ($_POST["affectedto"] > 0)
 	{
 		$usertodo->fetch($_POST["affectedto"]);
 	}
-	$actioncomm->usertodo = $usertodo;
+	$object->usertodo = $usertodo;
 	$userdone=new User($db);
 	if ($_POST["doneby"] > 0)
 	{
 		$userdone->fetch($_POST["doneby"]);
 	}
-	$actioncomm->userdone = $userdone;
+	$object->userdone = $userdone;
 
-	$actioncomm->note = trim($_POST["note"]);
-	if (isset($_POST["contactid"])) $actioncomm->contact = $contact;
+	$object->note = trim($_POST["note"]);
+	if (isset($_POST["contactid"])) $object->contact = $contact;
 	if (GETPOST('socid','int') > 0)
 	{
 		$societe = new Societe($db);
 		$societe->fetch(GETPOST('socid','int'));
-		$actioncomm->societe = $societe;
+		$object->societe = $societe;
 	}
 
 	// Special for module webcal and phenix
 	// TODO external modules
-	if (! empty($conf->webcalendar->enabled) && GETPOST('add_webcal') == 'on') $actioncomm->use_webcal=1;
-	if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $actioncomm->use_phenix=1;
+	if (! empty($conf->webcalendar->enabled) && GETPOST('add_webcal') == 'on') $object->use_webcal=1;
+	if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $object->use_phenix=1;
 
 	// Check parameters
-	if ($actioncomm->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent))))
+	if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent))))
 	{
 		$error++;
 		$action = 'create';
@@ -218,18 +218,18 @@ if ($action == 'add_action')
 	}
 
 	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$actioncomm);
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 
 	if (! $error)
 	{
 		$db->begin();
 
 		// On cree l'action
-		$idaction=$actioncomm->add($user);
+		$idaction=$object->add($user);
 
 		if ($idaction > 0)
 		{
-			if (! $actioncomm->error)
+			if (! $object->error)
 			{
 				$db->commit();
 				if (! empty($backtopage))
@@ -252,7 +252,7 @@ if ($action == 'add_action')
 				// If error
 				$db->rollback();
 				$langs->load("errors");
-				$error=$langs->trans($actioncomm->error);
+				$error=$langs->trans($object->error);
 				setEventMessage($error,'errors');
 				$action = 'create';
 			}
@@ -261,7 +261,7 @@ if ($action == 'add_action')
 		{
 			$db->rollback();
 			$langs->load("errors");
-			$error=$langs->trans($actioncomm->error);
+			$error=$langs->trans($object->error);
 			setEventMessage($error,'errors');
 			$action = 'create';
 		}
@@ -273,13 +273,12 @@ if ($action == 'add_action')
  */
 if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes')
 {
-	$actioncomm = new ActionComm($db);
-	$actioncomm->fetch($id);
+	$object->fetch($id);
 
 	if ($user->rights->agenda->myactions->delete
 		|| $user->rights->agenda->allactions->delete)
 	{
-		$result=$actioncomm->delete();
+		$result=$object->delete();
 
 		if ($result >= 0)
 		{
@@ -288,7 +287,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes')
 		}
 		else
 		{
-			$mesg=$actioncomm->error;
+			$mesg=$object->error;
 			setEventMessage($mesg,'errors');
 		}
 	}
@@ -314,27 +313,26 @@ if ($action == 'update')
 		if ($p2hour == -1) $p2hour='0';
 		if ($p2min == -1) $p2min='0';
 
-		$actioncomm = new Actioncomm($db);
-		$actioncomm->fetch($id);
+		$object->fetch($id);
 
 		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
 
-		$actioncomm->fk_action   = dol_getIdFromCode($db, $_POST["actioncode"], 'c_actioncomm');
-		$actioncomm->label       = $_POST["label"];
-		$actioncomm->datep       = $datep;
-		$actioncomm->datef       = $datef;
-		$actioncomm->percentage  = $percentage;
-		$actioncomm->priority    = $_POST["priority"];
-        $actioncomm->fulldayevent= $_POST["fullday"]?1:0;
-		$actioncomm->location    = GETPOST('location');
-		$actioncomm->societe->id = $_POST["socid"];
-		$actioncomm->contact->id = $_POST["contactid"];
-		$actioncomm->fk_project  = $_POST["projectid"];
-		$actioncomm->note        = $_POST["note"];
-		$actioncomm->pnote       = $_POST["note"];
-		$actioncomm->fk_element	 = $_POST["fk_element"];
-		$actioncomm->elementtype = $_POST["elementtype"];
+		$object->fk_action   = dol_getIdFromCode($db, $_POST["actioncode"], 'c_actioncomm');
+		$object->label       = $_POST["label"];
+		$object->datep       = $datep;
+		$object->datef       = $datef;
+		$object->percentage  = $percentage;
+		$object->priority    = $_POST["priority"];
+        $object->fulldayevent= $_POST["fullday"]?1:0;
+		$object->location    = GETPOST('location');
+		$object->societe->id = $_POST["socid"];
+		$object->contact->id = $_POST["contactid"];
+		$object->fk_project  = $_POST["projectid"];
+		$object->note        = $_POST["note"];
+		$object->pnote       = $_POST["note"];
+		$object->fk_element	 = $_POST["fk_element"];
+		$object->elementtype = $_POST["elementtype"];
 		if (! $datef && $percentage == 100)
 		{
 			$error=$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd"));
@@ -347,24 +345,24 @@ if ($action == 'update')
 		{
 			$usertodo->fetch($_POST["affectedto"]);
 		}
-		$actioncomm->usertodo = $usertodo;
-		$actioncomm->transparency=(GETPOST("transparency")=='on'?1:0);
+		$object->usertodo = $usertodo;
+		$object->transparency=(GETPOST("transparency")=='on'?1:0);
 
 		$userdone=new User($db);
 		if ($_POST["doneby"])
 		{
 			$userdone->fetch($_POST["doneby"]);
 		}
-		$actioncomm->userdone = $userdone;
+		$object->userdone = $userdone;
 
 		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$actioncomm);
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 
 		if (! $error)
 		{
 			$db->begin();
 
-			$result=$actioncomm->update($user);
+			$result=$object->update($user);
 
 			if ($result > 0)
 			{
@@ -379,8 +377,8 @@ if ($action == 'update')
 
 	if ($result < 0)
 	{
-		setEventMessage($actioncomm->error,'errors');
-		setEventMessage($actioncomm->errors,'errors');
+		setEventMessage($object->error,'errors');
+		setEventMessage($object->errors,'errors');
 	}
 	else
 	{
@@ -473,7 +471,7 @@ if ($action == 'create')
 	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
 		print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
-		$htmlactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$actioncomm->type_code, "actioncode","systemauto");
+		$htmlactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
 		print '</td></tr>';
 	}
 	else print '<input type="hidden" name="actioncode" value="AC_OTH">';
@@ -485,7 +483,7 @@ if ($action == 'create')
     print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday')?' checked="checked"':'').'></td></tr>';
 
 	// Date start
-	$datep=$actioncomm->datep;
+	$datep=$object->datep;
 	if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0);
 	print '<tr><td width="30%" class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>';
 	if (GETPOST("afaire") == 1) $form->select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend');
@@ -493,7 +491,7 @@ if ($action == 'create')
 	else $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
 	print '</td></tr>';
 	// Date end
-	$datef=$actioncomm->datef;
+	$datef=$object->datef;
     if (GETPOST('datef','int',1)) $datef=dol_stringtotime(GETPOST('datef','int',1),0);
 	print '<tr><td><span id="dateend"'.(GETPOST("actioncode") == 'AC_RDV'?' class="fieldrequired"':'').'>'.$langs->trans("DateActionEnd").'</span></td><td>';
 	if (GETPOST("afaire") == 1) $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
@@ -522,7 +520,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
     // Location
-    print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$actioncomm->location.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$object->location.'"></td></tr>';
 
 	print '</table>';
 
@@ -533,19 +531,19 @@ if ($action == 'create')
 	// Assigned to
 	$var=false;
 	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
-	$form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($actioncomm->usertodo->id) && $actioncomm->usertodo->id > 0 ? $actioncomm->usertodo->id : $user->id),'affectedto',1);
+	$form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1);
 	print '</td></tr>';
 
 	// Busy
 	print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td>';
-	print '<input id="transparency" type="checkbox" name="transparency" value="'.$actioncomm->transparency.'">';
+	print '<input id="transparency" type="checkbox" name="transparency" value="'.$object->transparency.'">';
 	print '</td></tr>';
 
 	// Realised by
 	if ($conf->global->AGENDA_ENABLE_DONEBY)
 	{
 		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-		$form->select_users(GETPOST("doneby")?GETPOST("doneby"):(! empty($actioncomm->userdone->id) && $percent==100?$actioncomm->userdone->id:0),'doneby',1);
+		$form->select_users(GETPOST("doneby")?GETPOST("doneby"):(! empty($object->userdone->id) && $percent==100?$object->userdone->id:0),'doneby',1);
 		print '</td></tr>';
 	}
 
@@ -608,30 +606,30 @@ if ($action == 'create')
 
 	if (GETPOST("datep") && preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/',GETPOST("datep"),$reg))
 	{
-		$actioncomm->datep=dol_mktime(0,0,0,$reg[2],$reg[3],$reg[1]);
+		$object->datep=dol_mktime(0,0,0,$reg[2],$reg[3],$reg[1]);
 	}
 
 	// Priority
 	print '<tr><td class="nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
-	print '<input type="text" name="priority" value="'.(GETPOST('priority')?GETPOST('priority'):($actioncomm->priority?$actioncomm->priority:'')).'" size="5">';
+	print '<input type="text" name="priority" value="'.(GETPOST('priority')?GETPOST('priority'):($object->priority?$object->priority:'')).'" size="5">';
 	print '</td></tr>';
 
     // Description
     print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
     require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('note',(GETPOST('note')?GETPOST('note'):$actioncomm->note),'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90);
+    $doleditor=new DolEditor('note',(GETPOST('note')?GETPOST('note'):$object->note),'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90);
     $doleditor->Create();
     print '</td></tr>';
 
 
     // Other attributes
-    $parameters=array('id'=>$actioncomm->id);
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$actioncomm,$action);    // Note that $action and $object may have been modified by hook
+    $parameters=array('id'=>$object->id);
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
-		print $actioncomm->showOptionals($extrafields,'edit');
+		print $object->showOptionals($extrafields,'edit');
 	}
 
 	print '</table>';
@@ -657,40 +655,39 @@ if ($id > 0)
 		dol_htmloutput_mesg($mesg);
 	}
 
-	$act = new ActionComm($db);
-	$result=$act->fetch($id);
-	$act->fetch_optionals($id,$extralabels);
+	$result=$object->fetch($id);
+	$object->fetch_optionals($id,$extralabels);
 
 	if ($result < 0)
 	{
-		dol_print_error($db,$act->error);
+		dol_print_error($db,$object->error);
 		exit;
 	}
 
 	$societe = new Societe($db);
-	if ($act->societe->id)
+	if ($object->societe->id)
 	{
-		$result=$societe->fetch($act->societe->id);
+		$result=$societe->fetch($object->societe->id);
 	}
-	$act->societe = $societe;
+	$object->societe = $societe;
 
-	if ($act->author->id > 0)   { $tmpuser=new User($db); $res=$tmpuser->fetch($act->author->id); $act->author=$tmpuser; }
-	if ($act->usermod->id > 0)  { $tmpuser=new User($db); $res=$tmpuser->fetch($act->usermod->id); $act->usermod=$tmpuser; }
-	if ($act->usertodo->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($act->usertodo->id); $act->usertodo=$tmpuser; }
-	if ($act->userdone->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($act->userdone->id); $act->userdone=$tmpuser; }
+	if ($object->author->id > 0)   { $tmpuser=new User($db); $res=$tmpuser->fetch($object->author->id); $object->author=$tmpuser; }
+	if ($object->usermod->id > 0)  { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermod->id); $object->usermod=$tmpuser; }
+	if ($object->usertodo->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usertodo->id); $object->usertodo=$tmpuser; }
+	if ($object->userdone->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->userdone->id); $object->userdone=$tmpuser; }
 
 	$contact = new Contact($db);
-	if ($act->contact->id)
+	if ($object->contact->id)
 	{
-		$result=$contact->fetch($act->contact->id,$user);
+		$result=$contact->fetch($object->contact->id,$user);
 	}
-	$act->contact = $contact;
+	$object->contact = $contact;
 
 	/*
 	 * Affichage onglets
 	 */
 
-	$head=actions_prepare_head($act);
+	$head=actions_prepare_head($object);
 
 	$now=dol_now();
 	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
@@ -734,7 +731,7 @@ if ($id > 0)
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '<input type="hidden" name="ref_ext" value="'.$act->ref_ext.'">';
+		print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1'? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
 		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
@@ -742,61 +739,61 @@ if ($id > 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">'.$object->id.'</td></tr>';
 
 		// Type
 		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
 			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
-			$htmlactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$act->type_code, "actioncode","systemauto");
+			$htmlactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
 			print '</td></tr>';
 		}
 
 		// Title
-		print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$act->label.'"></td></tr>';
+		print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$object->label.'"></td></tr>';
 
         // Full day event
-        print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($act->fulldayevent?' checked="checked"':'').'></td></tr>';
+        print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent?' checked="checked"':'').'></td></tr>';
 
 		// Date start
 		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td colspan="3">';
-		if (GETPOST("afaire") == 1) $form->select_date($act->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart');
-		else if (GETPOST("afaire") == 2) $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
-		else $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+		if (GETPOST("afaire") == 1) $form->select_date($object->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart');
+		else if (GETPOST("afaire") == 2) $form->select_date($object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+		else $form->select_date($object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
 		print '</td></tr>';
 		// Date end
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-		if (GETPOST("afaire") == 1) $form->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-		else if (GETPOST("afaire") == 2) $form->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-		else $form->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+		if (GETPOST("afaire") == 1) $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+		else if (GETPOST("afaire") == 2) $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+		else $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
 		print '</td></tr>';
 
 		// Status
 		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
-		$percent=GETPOST("percentage")?GETPOST("percentage"):$act->percentage;
+		$percent=GETPOST("percentage")?GETPOST("percentage"):$object->percentage;
 		$htmlactions->form_select_status_action('formaction',$percent,1);
 		print '</td></tr>';
 
         // Location
-        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$act->location.'"></td></tr>';
+        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$object->location.'"></td></tr>';
 
 		print '</table><br><br><table class="border" width="100%">';
 
 		// Assigned to
 		print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
-		print $form->select_dolusers($act->usertodo->id>0?$act->usertodo->id:-1,'affectedto',1);
+		print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'affectedto',1);
 		print '</td></tr>';
 
 		// Busy
 		print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td>';
-		print '<input id="transparency" type="checkbox" name="transparency"'.($act->transparency?' checked="checked"':'').'">';
+		print '<input id="transparency" type="checkbox" name="transparency"'.($object->transparency?' checked="checked"':'').'">';
 		print '</td></tr>';
 
 		// Realised by
 		if ($conf->global->AGENDA_ENABLE_DONEBY)
 		{
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
-			print $form->select_dolusers($act->userdone->id> 0?$act->userdone->id:-1,'doneby',1);
+			print $form->select_dolusers($object->userdone->id> 0?$object->userdone->id:-1,'doneby',1);
 			print '</td></tr>';
 		}
 
@@ -811,12 +808,12 @@ if ($id > 0)
 			print '<td>';
 			$events=array();
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-			print $form->select_company($act->societe->id,'socid','',1,1,0,$events);
+			print $form->select_company($object->societe->id,'socid','',1,1,0,$events);
 			print '</td>';
 
 			// Contact
 			print '<td>'.$langs->trans("Contact").'</td><td width="30%">';
-			$form->select_contacts($act->societe->id, $act->contact->id,'contactid',1);
+			$form->select_contacts($object->societe->id, $object->contact->id,'contactid',1);
 			print '</td></tr>';
 		}
 
@@ -830,7 +827,7 @@ if ($id > 0)
 			$langs->load("project");
 
 			print '<tr><td width="30%" valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
-			$numprojet=$formproject->select_projects($act->societe->id,$act->fk_project,'projectid');
+			$numprojet=$formproject->select_projects($object->societe->id,$object->fk_project,'projectid');
 			if ($numprojet==0)
 			{
 				print ' &nbsp; <a href="../../projet/fiche.php?socid='.$societe->id.'&action=create">'.$langs->trans("AddProject").'</a>';
@@ -840,31 +837,31 @@ if ($id > 0)
 
 		// Priority
 		print '<tr><td nowrap width="30%">'.$langs->trans("Priority").'</td><td colspan="3">';
-		print '<input type="text" name="priority" value="'.($act->priority?$act->priority:'').'" size="5">';
+		print '<input type="text" name="priority" value="'.($object->priority?$object->priority:'').'" size="5">';
 		print '</td></tr>';
 
 		// Object linked
-		if (! empty($act->fk_element) && ! empty($act->elementtype))
+		if (! empty($object->fk_element) && ! empty($object->elementtype))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
-			print '<td colspan="3">'.dolGetElementUrl($act->fk_element,$act->elementtype,1).'</td></tr>';
+			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
 		}
 
         // Description
         print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
         // Editeur wysiwyg
         require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-        $doleditor=new DolEditor('note',$act->note,'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_5,90);
+        $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_5,90);
         $doleditor->Create();
         print '</td></tr>';
 
         // Other attributes
-        $parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$act->id);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+        $parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
-			print $actioncomm->showOptionals($extrafields,'edit');
+			print $object->showOptionals($extrafields,'edit');
 
 		}
 
@@ -889,53 +886,53 @@ if ($id > 0)
 
 		// Ref
 		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($act, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
+		print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
 		print '</td></tr>';
 
 		// Type
 		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
-			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
 		}
 
 		// Title
-		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$act->label.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
 
         // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($act->fulldayevent).'</td></tr>';
+        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
 
 		// 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"));
+		if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
+		else print dol_print_date($object->datep,'day');
+		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
 		print '</td>';
 		print '<td rowspan="4" 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 '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
         print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-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 '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
         print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-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 '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
         print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
         print '</form>'."\n";
         print '</td>';
@@ -943,36 +940,36 @@ if ($id > 0)
 
 		// 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"));
+        if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
+		else print dol_print_date($object->datef,'day');
+		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
 		print '</td></tr>';
 
 		// Status
 		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">';
-		print $act->getLibStatut(4);
+		print $object->getLibStatut(4);
 		print '</td></tr>';
 
         // Location
-        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$act->location.'</td></tr>';
+        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
 
 		print '</table><br><br><table class="border" width="100%">';
 
 		// Assigned to
 		print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
-		if ($act->usertodo->id > 0) print $act->usertodo->getNomUrl(1);
+		if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1);
 		print '</td></tr>';
 
 		// Busy
 		print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td colspan="3">';
-		if ($act->usertodo->id > 0) print yn(($act->transparency > 0)?1:0);	// We show nothing if event is assigned to nobody
+		if ($object->usertodo->id > 0) print yn(($object->transparency > 0)?1:0);	// We show nothing if event is assigned to nobody
 		print '</td></tr>';
 
 		// Done by
 		if ($conf->global->AGENDA_ENABLE_DONEBY)
 		{
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
-			if ($act->userdone->id > 0) print $act->userdone->getNomUrl(1);
+			if ($object->userdone->id > 0) print $object->userdone->getNomUrl(1);
 			print '</td></tr>';
 		}
 
@@ -981,25 +978,25 @@ if ($id > 0)
 		// Third party - Contact
 		if ($conf->societe->enabled)
 		{
-			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')
+			print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->societe->id?$object->societe->getNomUrl(1):$langs->trans("None"));
+			if ($object->societe->id && $object->type_code == 'AC_TEL')
 			{
-				if ($act->societe->fetch($act->societe->id))
+				if ($object->societe->fetch($object->societe->id))
 				{
-					print "<br>".dol_print_phone($act->societe->phone);
+					print "<br>".dol_print_phone($object->societe->phone);
 				}
 			}
 			print '</td>';
 			print '<td>'.$langs->trans("Contact").'</td>';
 			print '<td>';
-			if ($act->contact->id > 0)
+			if ($object->contact->id > 0)
 			{
-				print $act->contact->getNomUrl(1);
-				if ($act->contact->id && $act->type_code == 'AC_TEL')
+				print $object->contact->getNomUrl(1);
+				if ($object->contact->id && $object->type_code == 'AC_TEL')
 				{
-					if ($act->contact->fetch($act->contact->id))
+					if ($object->contact->fetch($object->contact->id))
 					{
-						print "<br>".dol_print_phone($act->contact->phone_pro);
+						print "<br>".dol_print_phone($object->contact->phone_pro);
 					}
 				}
 			}
@@ -1014,10 +1011,10 @@ if ($id > 0)
 		if (! empty($conf->projet->enabled))
 		{
 			print '<tr><td width="30%" valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
-			if ($act->fk_project)
+			if ($object->fk_project)
 			{
 				$project=new Project($db);
-				$project->fetch($act->fk_project);
+				$project->fetch($object->fk_project);
 				print $project->getNomUrl(1,'',1);
 			}
 			print '</td></tr>';
@@ -1025,25 +1022,25 @@ if ($id > 0)
 
 		// Priority
 		print '<tr><td nowrap width="30%">'.$langs->trans("Priority").'</td><td colspan="3">';
-		print ($act->priority?$act->priority:'');
+		print ($object->priority?$object->priority:'');
 		print '</td></tr>';
 
 		// Object linked
-		if (! empty($act->fk_element) && ! empty($act->elementtype))
+		if (! empty($object->fk_element) && ! empty($object->elementtype))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
-			print '<td colspan="3">'.dolGetElementUrl($act->fk_element,$act->elementtype,1).'</td></tr>';
+			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
 		}
 
 		// Description
 		print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-		print dol_htmlentitiesbr($act->note);
+		print dol_htmlentitiesbr($object->note);
 		print '</td></tr>';
 
         // Other attributes
-		$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$act->id);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+		$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 		print '</table>';
 
@@ -1053,7 +1050,7 @@ if ($id > 0)
 			print '<br><br><table class="border" width="100%">';
 			foreach($extrafields->attribute_label as $key=>$label)
 			{
-				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($act->array_options['options_'.$key])?$act->array_options['options_'.$key]:''));
+				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options['options_'.$key])?$object->array_options['options_'.$key]:''));
 				print '<tr><td width="30%">'.$label.'</td><td>';
 				print $extrafields->showOutputField($key,$value);
 				print "</td></tr>\n";
@@ -1078,19 +1075,19 @@ if ($id > 0)
 		if ($action != 'edit')
 		{
 			if ($user->rights->agenda->allactions->create ||
-			   (($act->author->id == $user->id || $act->usertodo->id == $user->id) && $user->rights->agenda->myactions->create))
+			   (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->create))
 			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?action=edit&id='.$act->id.'">'.$langs->trans("Modify").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 			}
 			else
 			{
 				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
-	
+
 			if ($user->rights->agenda->allactions->delete ||
-			   (($act->author->id == $user->id || $act->usertodo->id == $user->id) && $user->rights->agenda->myactions->delete))
+			   (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->delete))
 			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="fiche.php?action=delete&id='.$act->id.'">'.$langs->trans("Delete").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="fiche.php?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
 			}
 			else
 			{
@@ -1098,7 +1095,7 @@ if ($id > 0)
 			}
 		}
 	}
-	
+
 	print '</div>';
 }