diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1ac24b56e6b..344c65832db 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1438,16 +1438,15 @@ if ($action == 'create') {
 	print '</div>';
 
 	print '</form>';
-} else {
-	if ($id > 0 || $ref) {
-		$result = $object->fetch($id, $ref);
+} elseif ($id > 0 || $ref) {
+	$result = $object->fetch($id, $ref);
 
-		$res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
-		if ($result > 0) {
-			if (!in_array($object->fk_user_author, $user->getAllChildIds(1))) {
-				if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-					&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
+	if ($result > 0) {
+		if (!in_array($object->fk_user_author, $user->getAllChildIds(1))) {
+			if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
+				&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 					print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
 
 					print '<div class="tabBar">';
@@ -1459,736 +1458,736 @@ if ($action == 'create') {
 					$db->close();
 
 					exit;
-				}
+			}
+		}
+
+		$head = expensereport_prepare_head($object);
+
+		if ($action == 'edit' && ($object->status < 3 || $object->status == 99)) {
+			print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
+
+			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
+
+			if ($object->status == 99) {
+				print '<input type="hidden" name="action" value="updateFromRefuse">';
+			} else {
+				print '<input type="hidden" name="action" value="update">';
 			}
 
-			$head = expensereport_prepare_head($object);
+			$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-			if ($action == 'edit' && ($object->status < 3 || $object->status == 99)) {
-				print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<table class="border" style="width:100%;">';
 
-				print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
+			print '<tr>';
+			print '<td>'.$langs->trans("User").'</td>';
+			print '<td>';
+			$userfee = new User($db);
+			if ($object->fk_user_author > 0) {
+				$userfee->fetch($object->fk_user_author);
+				print $userfee->getNomUrl(-1);
+			}
+			print '</td></tr>';
 
-				if ($object->status == 99) {
-					print '<input type="hidden" name="action" value="updateFromRefuse">';
-				} else {
-					print '<input type="hidden" name="action" value="update">';
-				}
+			// Ref
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
+			print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+			print '</td></tr>';
 
-				$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-				print '<table class="border" style="width:100%;">';
+			print '<tr>';
+			print '<td>'.$langs->trans("DateStart").'</td>';
+			print '<td>';
+			print $form->selectDate($object->date_debut, 'date_debut');
+			print '</td>';
+			print '</tr>';
+			print '<tr>';
+			print '<td>'.$langs->trans("DateEnd").'</td>';
+			print '<td>';
+			print $form->selectDate($object->date_fin, 'date_fin');
+			print '</td>';
+			print '</tr>';
 
+			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 				print '<tr>';
-				print '<td>'.$langs->trans("User").'</td>';
+				print '<td>'.$langs->trans("ModePaiement").'</td>';
+				print '<td>';
+				$form->select_types_paiements($object->fk_c_paiement, 'fk_c_paiement');
+				print '</td>';
+				print '</tr>';
+			}
+
+			if ($object->status < 3) {
+				print '<tr>';
+				print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
+				print '<td>';
+				$include_users = $object->fetch_users_approver_expensereport();
+				$s = $form->select_dolusers($object->fk_user_validator, "fk_user_validator", 1, "", 0, $include_users);
+				print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+				print '</td>';
+				print '</tr>';
+			} else {
+				print '<tr>';
+				print '<td>'.$langs->trans("VALIDOR").'</td>';
 				print '<td>';
 				$userfee = new User($db);
-				if ($object->fk_user_author > 0) {
-					$userfee->fetch($object->fk_user_author);
-					print $userfee->getNomUrl(-1);
-				}
+				$userfee->fetch($object->fk_user_valid);
+				print $userfee->getNomUrl(-1);
 				print '</td></tr>';
+			}
 
-				// Ref
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
-				print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+			if ($object->status == 6) {
+				print '<tr>';
+				print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
+				print '<td>';
+				$userfee = new User($db);
+				$userfee->fetch($user->id);
+				print $userfee->getNomUrl(-1);
 				print '</td></tr>';
+			}
 
-				print '<tr>';
-				print '<td>'.$langs->trans("DateStart").'</td>';
-				print '<td>';
-				print $form->selectDate($object->date_debut, 'date_debut');
-				print '</td>';
-				print '</tr>';
-				print '<tr>';
-				print '<td>'.$langs->trans("DateEnd").'</td>';
-				print '<td>';
-				print $form->selectDate($object->date_fin, 'date_fin');
-				print '</td>';
-				print '</tr>';
+			// Other attributes
+			//$cols = 3;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
 
-				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
-					print '<tr>';
-					print '<td>'.$langs->trans("ModePaiement").'</td>';
-					print '<td>';
-					$form->select_types_paiements($object->fk_c_paiement, 'fk_c_paiement');
-					print '</td>';
-					print '</tr>';
+			print '</table>';
+
+			print dol_get_fiche_end();
+
+			print '<div class="center">';
+			print '<input type="submit" value="'.$langs->trans("Modify").'" name="bouton" class="button">';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
+			print '</div>';
+
+			print '</form>';
+		} else {
+			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
+
+			// Clone confirmation
+			if ($action == 'clone') {
+				// Create an array for form
+				$criteriaforfilter = 'hierarchyme';
+				if (!empty($user->rights->expensereport->readall)) {
+					$criteriaforfilter = '';
 				}
+				$formquestion = array(
+					'text' => '',
+					array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
+				);
+				// Paiement incomplet. On demande si motif = escompte ou autre
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+			}
 
-				if ($object->status < 3) {
-					print '<tr>';
-					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
-					print '<td>';
-					$include_users = $object->fetch_users_approver_expensereport();
-					$s = $form->select_dolusers($object->fk_user_validator, "fk_user_validator", 1, "", 0, $include_users);
-					print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
-					print '</td>';
-					print '</tr>';
-				} else {
-					print '<tr>';
-					print '<td>'.$langs->trans("VALIDOR").'</td>';
-					print '<td>';
+			if ($action == 'save') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_validate", "", "", 1);
+			}
+
+			if ($action == 'save_from_refuse') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_save_from_refuse", "", "", 1);
+			}
+
+			if ($action == 'delete') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete", "", "", 1);
+			}
+
+			if ($action == 'validate') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("ValideTrip"), $langs->trans("ConfirmValideTrip"), "confirm_approve", "", "", 1);
+			}
+
+			if ($action == 'paid') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("PaidTrip"), $langs->trans("ConfirmPaidTrip"), "confirm_paid", "", "", 1);
+			}
+
+			if ($action == 'cancel') {
+				$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text", 'label'=>'<strong>'.$langs->trans("Comment").'</strong>', 'name'=>"detail_cancel", 'value'=>""));
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
+			}
+
+			if ($action == 'setdraft') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
+			}
+
+			if ($action == 'refuse') {		// Deny
+				$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text", 'label'=>$langs->trans("Comment"), 'name'=>"detail_refuse", 'value'=>""));
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
+			}
+
+			if ($action == 'delete_line') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid', 'int'), $langs->trans("DeleteLine"), $langs->trans("ConfirmDeleteLine"), "confirm_delete_line", '', 'yes', 1);
+			}
+
+			// Print form confirm
+			print $formconfirm;
+
+			// Expense report card
+			$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+			$morehtmlref = '<div class="refidno">';
+			/*
+			 // Ref customer
+			 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
+			 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
+			 // Thirdparty
+			 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+			 // Project
+			 if (! empty($conf->projet->enabled))
+			 {
+			 $langs->load("projects");
+			 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			 if ($user->rights->commande->creer)
+			 {
+			 if ($action != 'classify')
+			 $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			 if ($action == 'classify') {
+			 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+			 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+			 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			 $morehtmlref.='</form>';
+			 } else {
+			 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			 }
+			 } else {
+			 if (! empty($object->fk_project)) {
+			 $proj = new Project($db);
+			 $proj->fetch($object->fk_project);
+			 $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+			 $morehtmlref.=$proj->ref;
+			 $morehtmlref.='</a>';
+			 } else {
+			 $morehtmlref.='';
+			 }
+			 }
+			 }*/
+			 $morehtmlref .= '</div>';
+
+			 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+			 print '<div class="fichecenter">';
+			 print '<div class="fichehalfleft">';
+			 print '<div class="underbanner clearboth"></div>';
+
+			 print '<table class="border tableforfield centpercent">';
+
+			 // Author
+			 print '<tr>';
+			 print '<td class="titlefield">'.$langs->trans("User").'</td>';
+			 print '<td>';
+			if ($object->fk_user_author > 0) {
+				$userauthor = new User($db);
+				$result = $userauthor->fetch($object->fk_user_author);
+				if ($result < 0) {
+					dol_print_error('', $userauthor->error);
+				} elseif ($result > 0) {
+					print $userauthor->getNomUrl(-1);
+				}
+			}
+			 print '</td></tr>';
+
+			 // Period
+			 print '<tr>';
+			 print '<td class="titlefield">'.$langs->trans("Period").'</td>';
+			 print '<td>';
+			 print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
+			 print '</td>';
+			 print '</tr>';
+			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
+				print '<tr>';
+				print '<td>'.$langs->trans("ModePaiement").'</td>';
+				print '<td>'.$object->fk_c_paiement.'</td>';
+				print '</tr>';
+			}
+
+			 // Validation date
+			 print '<tr>';
+			 print '<td>'.$langs->trans("DATE_SAVE").'</td>';
+			 print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser');
+			if ($object->status == 2 && $object->hasDelay('toapprove')) {
+				print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToApprove"));
+			}
+			if ($object->status == 5 && $object->hasDelay('topay')) {
+				print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToPay"));
+			}
+			 print '</td></tr>';
+			 print '</tr>';
+
+			 // User to inform for approval
+			if ($object->status <= ExpenseReport::STATUS_VALIDATED) {	// informed
+				print '<tr>';
+				print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
+				print '<td>';
+				if ($object->fk_user_validator > 0) {
 					$userfee = new User($db);
-					$userfee->fetch($object->fk_user_valid);
-					print $userfee->getNomUrl(-1);
-					print '</td></tr>';
-				}
-
-				if ($object->status == 6) {
-					print '<tr>';
-					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
-					print '<td>';
-					$userfee = new User($db);
-					$userfee->fetch($user->id);
-					print $userfee->getNomUrl(-1);
-					print '</td></tr>';
-				}
-
-				// Other attributes
-				//$cols = 3;
-				//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
-
-				print '</table>';
-
-				print dol_get_fiche_end();
-
-				print '<div class="center">';
-				print '<input type="submit" value="'.$langs->trans("Modify").'" name="bouton" class="button">';
-				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
-				print '</div>';
-
-				print '</form>';
-			} else {
-				print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
-
-				// Clone confirmation
-				if ($action == 'clone') {
-					// Create an array for form
-					$criteriaforfilter = 'hierarchyme';
-					if (!empty($user->rights->expensereport->readall)) {
-						$criteriaforfilter = '';
-					}
-					$formquestion = array(
-						'text' => '',
-						array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
-					);
-					// Paiement incomplet. On demande si motif = escompte ou autre
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-				}
-
-				if ($action == 'save') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_validate", "", "", 1);
-				}
-
-				if ($action == 'save_from_refuse') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_save_from_refuse", "", "", 1);
-				}
-
-				if ($action == 'delete') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete", "", "", 1);
-				}
-
-				if ($action == 'validate') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("ValideTrip"), $langs->trans("ConfirmValideTrip"), "confirm_approve", "", "", 1);
-				}
-
-				if ($action == 'paid') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("PaidTrip"), $langs->trans("ConfirmPaidTrip"), "confirm_paid", "", "", 1);
-				}
-
-				if ($action == 'cancel') {
-					$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text", 'label'=>'<strong>'.$langs->trans("Comment").'</strong>', 'name'=>"detail_cancel", 'value'=>""));
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
-				}
-
-				if ($action == 'setdraft') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
-				}
-
-				if ($action == 'refuse') {		// Deny
-					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text", 'label'=>$langs->trans("Comment"), 'name'=>"detail_refuse", 'value'=>""));
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
-				}
-
-				if ($action == 'delete_line') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid', 'int'), $langs->trans("DeleteLine"), $langs->trans("ConfirmDeleteLine"), "confirm_delete_line", '', 'yes', 1);
-				}
-
-				// Print form confirm
-				print $formconfirm;
-
-				// Expense report card
-				$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-				$morehtmlref = '<div class="refidno">';
-				/*
-				// Ref customer
-				$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
-				$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
-				// Thirdparty
-				$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-				// Project
-				if (! empty($conf->projet->enabled))
-				{
-					$langs->load("projects");
-					$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-					if ($user->rights->commande->creer)
-					{
-						if ($action != 'classify')
-							$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-							if ($action == 'classify') {
-								//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-								$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-								$morehtmlref.='<input type="hidden" name="action" value="classin">';
-								$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-								$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-								$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-								$morehtmlref.='</form>';
-							} else {
-								$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-							}
-					} else {
-						if (! empty($object->fk_project)) {
-							$proj = new Project($db);
-							$proj->fetch($object->fk_project);
-							$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-							$morehtmlref.=$proj->ref;
-							$morehtmlref.='</a>';
-						} else {
-							$morehtmlref.='';
-						}
-					}
-				}*/
-				$morehtmlref .= '</div>';
-
-				dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-				print '<div class="fichecenter">';
-				print '<div class="fichehalfleft">';
-				print '<div class="underbanner clearboth"></div>';
-
-				print '<table class="border tableforfield centpercent">';
-
-				// Author
-				print '<tr>';
-				print '<td class="titlefield">'.$langs->trans("User").'</td>';
-				print '<td>';
-				if ($object->fk_user_author > 0) {
-					$userauthor = new User($db);
-					$result = $userauthor->fetch($object->fk_user_author);
-					if ($result < 0) {
-						dol_print_error('', $userauthor->error);
-					} elseif ($result > 0) {
-						print $userauthor->getNomUrl(-1);
-					}
-				}
-				print '</td></tr>';
-
-				// Period
-				print '<tr>';
-				print '<td class="titlefield">'.$langs->trans("Period").'</td>';
-				print '<td>';
-				print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
-				print '</td>';
-				print '</tr>';
-				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
-					print '<tr>';
-					print '<td>'.$langs->trans("ModePaiement").'</td>';
-					print '<td>'.$object->fk_c_paiement.'</td>';
-					print '</tr>';
-				}
-
-				// Validation date
-				print '<tr>';
-				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
-				print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser');
-				if ($object->status == 2 && $object->hasDelay('toapprove')) {
-					print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToApprove"));
-				}
-				if ($object->status == 5 && $object->hasDelay('topay')) {
-					print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToPay"));
-				}
-				print '</td></tr>';
-				print '</tr>';
-
-				// User to inform for approval
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {	// informed
-					print '<tr>';
-					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
-					print '<td>';
-					if ($object->fk_user_validator > 0) {
-						$userfee = new User($db);
-						$result = $userfee->fetch($object->fk_user_validator);
-						if ($result > 0) {
-							print $userfee->getNomUrl(-1);
-						}
-						if (empty($userfee->email) || !isValidEmail($userfee->email)) {
-							$langs->load("errors");
-							print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
-						}
-					}
-					print '</td></tr>';
-				} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
-					print '<tr>';
-					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
-					print '<td>';
-					if ($object->fk_user_cancel > 0) {
-						$userfee = new User($db);
-						$result = $userfee->fetch($object->fk_user_cancel);
-						if ($result > 0) {
-							print $userfee->getNomUrl(-1);
-						}
-					}
-					print '</td></tr>';
-
-					print '<tr>';
-					print '<td>'.$langs->trans("MOTIF_CANCEL").'</td>';
-					print '<td>'.$object->detail_cancel.'</td></tr>';
-					print '</tr>';
-					print '<tr>';
-					print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
-					print '<td>'.dol_print_date($object->date_cancel, 'dayhour', 'tzuser').'</td></tr>';
-					print '</tr>';
-				} else {
-					print '<tr>';
-					print '<td>'.$langs->trans("ApprovedBy").'</td>';
-					print '<td>';
-					if ($object->fk_user_approve > 0) {
-						$userapp = new User($db);
-						$result = $userapp->fetch($object->fk_user_approve);
-						if ($result > 0) {
-							print $userapp->getNomUrl(-1);
-						}
-					}
-					print '</td></tr>';
-
-					print '<tr>';
-					print '<td>'.$langs->trans("DateApprove").'</td>';
-					print '<td>'.dol_print_date($object->date_approve, 'dayhour', 'tzuser').'</td></tr>';
-					print '</tr>';
-				}
-
-				if ($object->status == 99 || !empty($object->detail_refuse)) {
-					print '<tr>';
-					print '<td>'.$langs->trans("REFUSEUR").'</td>';
-					print '<td>';
-					$userfee = new User($db);
-					$result = $userfee->fetch($object->fk_user_refuse);
+					$result = $userfee->fetch($object->fk_user_validator);
 					if ($result > 0) {
 						print $userfee->getNomUrl(-1);
 					}
-					print '</td></tr>';
-
-					print '<tr>';
-					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
-					print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser');
-					if ($object->detail_refuse) {
-						print ' - '.$object->detail_refuse;
+					if (empty($userfee->email) || !isValidEmail($userfee->email)) {
+						$langs->load("errors");
+						print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
 					}
-					print '</td>';
-					print '</tr>';
 				}
+				print '</td></tr>';
+			} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
+				print '<tr>';
+				print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
+				print '<td>';
+				if ($object->fk_user_cancel > 0) {
+					$userfee = new User($db);
+					$result = $userfee->fetch($object->fk_user_cancel);
+					if ($result > 0) {
+						print $userfee->getNomUrl(-1);
+					}
+				}
+				print '</td></tr>';
 
-				if ($object->status == $object::STATUS_CLOSED) {
-					/* TODO this fields are not yet filled
-					print '<tr>';
-					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
-					print '<td>';
-					$userfee=new User($db);
-					$userfee->fetch($object->fk_user_paid);
+				print '<tr>';
+				print '<td>'.$langs->trans("MOTIF_CANCEL").'</td>';
+				print '<td>'.$object->detail_cancel.'</td></tr>';
+				print '</tr>';
+				print '<tr>';
+				print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
+				print '<td>'.dol_print_date($object->date_cancel, 'dayhour', 'tzuser').'</td></tr>';
+				print '</tr>';
+			} else {
+				print '<tr>';
+				print '<td>'.$langs->trans("ApprovedBy").'</td>';
+				print '<td>';
+				if ($object->fk_user_approve > 0) {
+					$userapp = new User($db);
+					$result = $userapp->fetch($object->fk_user_approve);
+					if ($result > 0) {
+						print $userapp->getNomUrl(-1);
+					}
+				}
+				print '</td></tr>';
+
+				print '<tr>';
+				print '<td>'.$langs->trans("DateApprove").'</td>';
+				print '<td>'.dol_print_date($object->date_approve, 'dayhour', 'tzuser').'</td></tr>';
+				print '</tr>';
+			}
+
+			if ($object->status == 99 || !empty($object->detail_refuse)) {
+				print '<tr>';
+				print '<td>'.$langs->trans("REFUSEUR").'</td>';
+				print '<td>';
+				$userfee = new User($db);
+				$result = $userfee->fetch($object->fk_user_refuse);
+				if ($result > 0) {
 					print $userfee->getNomUrl(-1);
-					print '</td></tr>';
-					print '<tr>';
-					print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';
-					print '<td>'.$object->date_paiement.'</td></tr>';
-					print '</tr>';
-					*/
 				}
-
-				// Other attributes
-				$cols = 2;
-				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-				print '</table>';
-
-				print '</div>';
-				print '<div class="fichehalfright">';
-				print '<div class="ficheaddleft">';
-				print '<div class="underbanner clearboth"></div>';
-
-				print '<table class="border tableforfield centpercent">';
-
-				// Amount
-				print '<tr>';
-				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
-				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
-				$rowspan = 5;
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
-					$rowspan++;
-				} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
-					$rowspan += 2;
-				} else {
-					$rowspan += 2;
-				}
-				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) {
-					$rowspan += 2;
-				}
-				if ($object->status == ExpenseReport::STATUS_CLOSED) {
-					$rowspan += 2;
-				}
-				print "</td>";
-				print '</tr>';
+				print '</td></tr>';
 
 				print '<tr>';
-				print '<td>'.$langs->trans("AmountVAT").'</td>';
-				print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				print '<td>'.$langs->trans("DATE_REFUS").'</td>';
+				print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser');
+				if ($object->detail_refuse) {
+					print ' - '.$object->detail_refuse;
+				}
+				print '</td>';
 				print '</tr>';
+			}
 
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountTTC").'</td>';
-				print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
-				print '</tr>';
+			if ($object->status == $object::STATUS_CLOSED) {
+				/* TODO this fields are not yet filled
+				  print '<tr>';
+				  print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
+				  print '<td>';
+				  $userfee=new User($db);
+				  $userfee->fetch($object->fk_user_paid);
+				  print $userfee->getNomUrl(-1);
+				  print '</td></tr>';
+				  print '<tr>';
+				  print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';
+				  print '<td>'.$object->date_paiement.'</td></tr>';
+				  print '</tr>';
+				  */
+			}
 
-				// List of payments already done
-				$nbcols = 3;
-				if (!empty($conf->banque->enabled)) {
-					$nbrows++;
-					$nbcols++;
+			 // Other attributes
+			 $cols = 2;
+			 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+			 print '</table>';
+
+			 print '</div>';
+			 print '<div class="fichehalfright">';
+			 print '<div class="ficheaddleft">';
+			 print '<div class="underbanner clearboth"></div>';
+
+			 print '<table class="border tableforfield centpercent">';
+
+			 // Amount
+			 print '<tr>';
+			 print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
+			 print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+			 $rowspan = 5;
+			if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
+				$rowspan++;
+			} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
+				$rowspan += 2;
+			} else {
+				$rowspan += 2;
+			}
+			if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) {
+				$rowspan += 2;
+			}
+			if ($object->status == ExpenseReport::STATUS_CLOSED) {
+				$rowspan += 2;
+			}
+			 print "</td>";
+			 print '</tr>';
+
+			 print '<tr>';
+			 print '<td>'.$langs->trans("AmountVAT").'</td>';
+			 print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+			 print '</tr>';
+
+			 print '<tr>';
+			 print '<td>'.$langs->trans("AmountTTC").'</td>';
+			 print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+			 print '</tr>';
+
+			 // List of payments already done
+			 $nbcols = 3;
+			if (!empty($conf->banque->enabled)) {
+				$nbrows++;
+				$nbcols++;
+			}
+
+			 print '<table class="noborder paymenttable" width="100%">';
+
+			 print '<tr class="liste_titre">';
+			 print '<td class="liste_titre">'.$langs->trans('Payments').'</td>';
+			 print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
+			 print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
+			if (!empty($conf->banque->enabled)) {
+				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+			}
+			 print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
+			 print '<td class="liste_titre" width="18">&nbsp;</td>';
+			 print '</tr>';
+
+			 // Payments already done (from payment on this expensereport)
+			 $sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
+			 $sql .= "c.code as p_code, c.libelle as payment_type,";
+			 $sql .= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
+			 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
+			 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
+			 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+			 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+			 $sql .= " WHERE e.rowid = '".$id."'";
+			 $sql .= " AND p.fk_expensereport = e.rowid";
+			 $sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
+			 $sql .= " ORDER BY dp";
+
+			 $resql = $db->query($sql);
+			if ($resql) {
+				$num = $db->num_rows($resql);
+				$i = 0; $totalpaid = 0;
+				while ($i < $num) {
+					$objp = $db->fetch_object($resql);
+
+					$paymentexpensereportstatic->id = $objp->rowid;
+					$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
+					$paymentexpensereportstatic->ref = $objp->rowid;
+					$paymentexpensereportstatic->num_payment = $objp->num_payment;
+					$paymentexpensereportstatic->payment_code = $objp->payment_code;
+
+					print '<tr class="oddseven">';
+					print '<td>';
+					print $paymentexpensereportstatic->getNomUrl(1);
+					print '</td>';
+					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+					$labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
+					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
+					if (!empty($conf->banque->enabled)) {
+						$bankaccountstatic->id = $objp->baid;
+						$bankaccountstatic->ref = $objp->baref;
+						$bankaccountstatic->label = $objp->baref;
+						$bankaccountstatic->number = $objp->banumber;
+
+						if (!empty($conf->accounting->enabled)) {
+							$bankaccountstatic->account_number = $objp->account_number;
+
+							$accountingjournal = new AccountingJournal($db);
+							$accountingjournal->fetch($objp->fk_accountancy_journal);
+							$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+						}
+
+						print '<td class="right">';
+						if ($bankaccountstatic->id) {
+							print $bankaccountstatic->getNomUrl(1, 'transactions');
+						}
+						print '</td>';
+					}
+					print '<td class="right">'.price($objp->amount)."</td>";
+					print '<td></td>';
+					print "</tr>";
+					$totalpaid += $objp->amount;
+					$i++;
+				}
+				if (!is_null($totalpaid)) {
+					$totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
 				}
 
-				print '<table class="noborder paymenttable" width="100%">';
+				$remaintopay = price2num($object->total_ttc - $totalpaid);
+				$resteapayeraffiche = $remaintopay;
+
+				$cssforamountpaymentcomplete = 'amountpaymentcomplete';
+
+				if ($object->status == ExpenseReport::STATUS_REFUSED) {
+					$cssforamountpaymentcomplete = 'amountpaymentneutral';
+					$resteapayeraffiche = 0;
+				} elseif ($object->paid == 0) {
+					$cssforamountpaymentcomplete = 'amountpaymentneutral';
+				}
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").':</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").':</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
+
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay").':</td>';
+				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
+
+				$db->free($resql);
+			} else {
+				dol_print_error($db);
+			}
+			 print "</table>";
+
+			 print '</div>';
+			 print '</div>';
+			 print '</div>';
+
+			 print '<div class="clearboth"></div><br>';
+
+			 print '<div style="clear: both;"></div>';
+
+			 $actiontouse = 'updateline';
+			if (($object->status == 0 || $object->status == 99) && $action != 'editline') {
+				$actiontouse = 'addline';
+			}
+
+			 print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
+			 print '<input type="hidden" name="token" value="'.newToken().'">';
+			 print '<input type="hidden" name="action" value="'.$actiontouse.'">';
+			 print '<input type="hidden" name="id" value="'.$object->id.'">';
+			 print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
+
+			 print '<div class="div-table-responsive-no-min">';
+			 print '<table id="tablelines" class="noborder centpercent">';
+
+			if (!empty($object->lines)) {
+				$i = 0; $total = 0;
 
 				print '<tr class="liste_titre">';
-				print '<td class="liste_titre">'.$langs->trans('Payments').'</td>';
-				print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
-				print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
-				if (!empty($conf->banque->enabled)) {
-					print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+				print '<td class="center">'.$langs->trans('LineNb').'</td>';
+				//print '<td class="center">'.$langs->trans('Piece').'</td>';
+				print '<td class="center">'.$langs->trans('Date').'</td>';
+				if (!empty($conf->projet->enabled)) {
+					print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
+				}
+				print '<td class="center">'.$langs->trans('Type').'</td>';
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					print '<td>'.$langs->trans('CarCategory').'</td>';
+				}
+				print '<td>'.$langs->trans('Description').'</td>';
+				print '<td class="right">'.$langs->trans('VAT').'</td>';
+				print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
+				print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
+				print '<td class="right">'.$langs->trans('Qty').'</td>';
+				if ($action != 'editline') {
+					print '<td class="right">'.$langs->trans('AmountHT').'</td>';
+					print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+				}
+				// Picture
+				print '<td>';
+				print '</td>';
+				// Ajout des boutons de modification/suppression
+				if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer) {
+					print '<td class="right"></td>';
 				}
-				print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
-				print '<td class="liste_titre" width="18">&nbsp;</td>';
 				print '</tr>';
 
-				// Payments already done (from payment on this expensereport)
-				$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
-				$sql .= "c.code as p_code, c.libelle as payment_type,";
-				$sql .= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
-				$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
-				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-				$sql .= " WHERE e.rowid = '".$id."'";
-				$sql .= " AND p.fk_expensereport = e.rowid";
-				$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
-				$sql .= " ORDER BY dp";
+				foreach ($object->lines as &$line) {
+					$numline = $i + 1;
 
-				$resql = $db->query($sql);
-				if ($resql) {
-					$num = $db->num_rows($resql);
-					$i = 0; $totalpaid = 0;
-					while ($i < $num) {
-						$objp = $db->fetch_object($resql);
+					if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int')) {
+						print '<tr class="oddeven">';
 
-						$paymentexpensereportstatic->id = $objp->rowid;
-						$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
-						$paymentexpensereportstatic->ref = $objp->rowid;
-						$paymentexpensereportstatic->num_payment = $objp->num_payment;
-						$paymentexpensereportstatic->payment_code = $objp->payment_code;
-
-						print '<tr class="oddseven">';
-						print '<td>';
-						print $paymentexpensereportstatic->getNomUrl(1);
+						// Num
+						print '<td class="center">';
+						print $numline;
 						print '</td>';
-						print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-						$labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
-						print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-						if (!empty($conf->banque->enabled)) {
-							$bankaccountstatic->id = $objp->baid;
-							$bankaccountstatic->ref = $objp->baref;
-							$bankaccountstatic->label = $objp->baref;
-							$bankaccountstatic->number = $objp->banumber;
 
-							if (!empty($conf->accounting->enabled)) {
-								$bankaccountstatic->account_number = $objp->account_number;
+						// Date
+						print '<td class="center">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
 
-								$accountingjournal = new AccountingJournal($db);
-								$accountingjournal->fetch($objp->fk_accountancy_journal);
-								$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-							}
-
-							print '<td class="right">';
-							if ($bankaccountstatic->id) {
-								print $bankaccountstatic->getNomUrl(1, 'transactions');
+						// Project
+						if (!empty($conf->projet->enabled)) {
+							print '<td>';
+							if ($line->fk_project > 0) {
+								$projecttmp->id = $line->fk_project;
+								$projecttmp->ref = $line->projet_ref;
+								$projecttmp->title = $line->projet_title;
+								print $projecttmp->getNomUrl(1);
 							}
 							print '</td>';
 						}
-						print '<td class="right">'.price($objp->amount)."</td>";
-						print '<td></td>';
-						print "</tr>";
-						$totalpaid += $objp->amount;
-						$i++;
-					}
-					if (!is_null($totalpaid)) {
-						$totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
-					}
 
-					$remaintopay = price2num($object->total_ttc - $totalpaid);
-					$resteapayeraffiche = $remaintopay;
+						// Type of fee
+						print '<td class="center">';
+						$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
+						print $labeltype;
+						print '</td>';
 
-					$cssforamountpaymentcomplete = 'amountpaymentcomplete';
-
-					if ($object->status == ExpenseReport::STATUS_REFUSED) {
-						$cssforamountpaymentcomplete = 'amountpaymentneutral';
-						$resteapayeraffiche = 0;
-					} elseif ($object->paid == 0) {
-						$cssforamountpaymentcomplete = 'amountpaymentneutral';
-					}
-					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").':</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
-					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").':</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
-
-					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay").':</td>';
-					print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
-
-					$db->free($resql);
-				} else {
-					dol_print_error($db);
-				}
-				print "</table>";
-
-				print '</div>';
-				print '</div>';
-				print '</div>';
-
-				print '<div class="clearboth"></div><br>';
-
-				print '<div style="clear: both;"></div>';
-
-				$actiontouse = 'updateline';
-				if (($object->status == 0 || $object->status == 99) && $action != 'editline') {
-					$actiontouse = 'addline';
-				}
-
-				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="'.$actiontouse.'">';
-				print '<input type="hidden" name="id" value="'.$object->id.'">';
-				print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
-
-				print '<div class="div-table-responsive-no-min">';
-				print '<table id="tablelines" class="noborder centpercent">';
-
-				if (!empty($object->lines)) {
-					$i = 0; $total = 0;
-
-					print '<tr class="liste_titre">';
-					print '<td class="center">'.$langs->trans('LineNb').'</td>';
-					//print '<td class="center">'.$langs->trans('Piece').'</td>';
-					print '<td class="center">'.$langs->trans('Date').'</td>';
-					if (!empty($conf->projet->enabled)) {
-						print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
-					}
-					print '<td class="center">'.$langs->trans('Type').'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						print '<td>'.$langs->trans('CarCategory').'</td>';
-					}
-					print '<td>'.$langs->trans('Description').'</td>';
-					print '<td class="right">'.$langs->trans('VAT').'</td>';
-					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-					print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
-					print '<td class="right">'.$langs->trans('Qty').'</td>';
-					if ($action != 'editline') {
-						print '<td class="right">'.$langs->trans('AmountHT').'</td>';
-						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-					}
-					// Picture
-					print '<td>';
-					print '</td>';
-					// Ajout des boutons de modification/suppression
-					if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer) {
-						print '<td class="right"></td>';
-					}
-					print '</tr>';
-
-					foreach ($object->lines as &$line) {
-						$numline = $i + 1;
-
-						if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int')) {
-							print '<tr class="oddeven">';
-
-							// Num
-							print '<td class="center">';
-							print $numline;
+						// IK
+						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+							print '<td class="fk_c_exp_tax_cat">';
+							print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
 							print '</td>';
+						}
 
-							// Date
-							print '<td class="center">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
+						// Comment
+						print '<td class="left">'.dol_nl2br($line->comments).'</td>';
+						// VAT rate
+						print '<td class="right">'.vatrate($line->vatrate, true).'</td>';
+						// Unit price HT
+						print '<td class="right">';
+						if (!empty($line->value_unit_ht)) {
+							print price($line->value_unit_ht);
+						} else {
+							$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
+							$pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
+							print $pricenettoshow;
+						}
+						print '</td>';
 
-							// Project
-							if (!empty($conf->projet->enabled)) {
-								print '<td>';
-								if ($line->fk_project > 0) {
-									$projecttmp->id = $line->fk_project;
-									$projecttmp->ref = $line->projet_ref;
-									$projecttmp->title = $line->projet_title;
-									print $projecttmp->getNomUrl(1);
-								}
-								print '</td>';
-							}
+						print '<td class="right">'.price($line->value_unit).'</td>';
 
-							// Type of fee
-							print '<td class="center">';
-							$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
-							print $labeltype;
-							print '</td>';
+						print '<td class="right">'.dol_escape_htmltag($line->qty).'</td>';
 
-							// IK
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-								print '<td class="fk_c_exp_tax_cat">';
-								print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
-								print '</td>';
-							}
+						if ($action != 'editline') {
+							print '<td class="right">'.price($line->total_ht).'</td>';
+							print '<td class="right">'.price($line->total_ttc).'</td>';
+						}
 
-							// Comment
-							print '<td class="left">'.dol_nl2br($line->comments).'</td>';
-							// VAT rate
-							print '<td class="right">'.vatrate($line->vatrate, true).'</td>';
-							// Unit price HT
-							print '<td class="right">';
-							if (!empty($line->value_unit_ht)) {
-								print price($line->value_unit_ht);
-							} else {
-								$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
-								$pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
-								print $pricenettoshow;
-							}
-							print '</td>';
+						// Column with preview
+						print '<td class="center">';
+						if ($line->fk_ecm_files > 0) {
+							$modulepart = 'expensereport';
+							$maxheightmini = 32;
 
-							print '<td class="right">'.price($line->value_unit).'</td>';
-
-							print '<td class="right">'.dol_escape_htmltag($line->qty).'</td>';
-
-							if ($action != 'editline') {
-								print '<td class="right">'.price($line->total_ht).'</td>';
-								print '<td class="right">'.price($line->total_ttc).'</td>';
-							}
-
-							// Column with preview
-							print '<td class="center">';
-							if ($line->fk_ecm_files > 0) {
-								$modulepart = 'expensereport';
-								$maxheightmini = 32;
-
-								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-								if ($result > 0) {
-									$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
-									$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
-									if (image_format_supported($fileinfo['basename']) > 0) {
-										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-										if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
-											$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
-										}
-										//print $file['path'].'/'.$minifile.'<br>';
-										$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
-										if (empty($urlforhref)) {
-											$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
-											print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
-										} else {
-											print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-										}
-										print '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
-										print '</a>';
+							$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
+							if ($result > 0) {
+								$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
+								$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
+								if (image_format_supported($fileinfo['basename']) > 0) {
+									$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+									if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
+										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+									}
+									//print $file['path'].'/'.$minifile.'<br>';
+									$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+									if (empty($urlforhref)) {
+										$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+										print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
 									} else {
-										$modulepart = 'expensereport';
-										$thumbshown = 0;
-										if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename)) {
-											$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename;
-											$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
-											$relativepathimage = $relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
+										print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+									}
+									print '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
+									print '</a>';
+								} else {
+									$modulepart = 'expensereport';
+									$thumbshown = 0;
+									if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename)) {
+										$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename;
+										$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
+										$relativepathimage = $relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
 
-											$pdfexists = file_exists($filepdf);
-											if ($pdfexists) {
-												// Conversion du PDF en image png si fichier png non existant
-												if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
-													if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
-														include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-														$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-														if ($ret < 0) {
-															$error++;
-														}
+										$pdfexists = file_exists($filepdf);
+										if ($pdfexists) {
+											// Conversion du PDF en image png si fichier png non existant
+											if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
+												if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
+													include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+													$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
+													if ($ret < 0) {
+														$error++;
 													}
 												}
 											}
+										}
 
-											if ($pdfexists && !$error) {
-												$heightforphotref = 70;
-												if (!empty($conf->dol_optimize_smallscreen)) {
-													$heightforphotref = 60;
-												}
-												// If the preview file is found
-												if (file_exists($fileimage)) {
-													$thumbshown = 1;
-													print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
-												}
+										if ($pdfexists && !$error) {
+											$heightforphotref = 70;
+											if (!empty($conf->dol_optimize_smallscreen)) {
+												$heightforphotref = 60;
+											}
+											// If the preview file is found
+											if (file_exists($fileimage)) {
+												$thumbshown = 1;
+												print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
 											}
 										}
+									}
 
-										if (!$thumbshown) {
-											print img_mime($ecmfilesstatic->filename);
-										}
+									if (!$thumbshown) {
+										print img_mime($ecmfilesstatic->filename);
 									}
 								}
 							}
+						}
+						print '</td>';
+
+						// Ajout des boutons de modification/suppression
+						if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) {
+							print '<td class="nowrap right">';
+
+							print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
+							print img_edit();
+							print '</a> &nbsp; ';
+							print '<a class="paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_line&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
+							print img_delete();
+							print '</a>';
+
 							print '</td>';
-
-							// Ajout des boutons de modification/suppression
-							if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) {
-								print '<td class="nowrap right">';
-
-								print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
-								print img_edit();
-								print '</a> &nbsp; ';
-								print '<a class="paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_line&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
-								print img_delete();
-								print '</a>';
-
-								print '</td>';
-							}
-
-							print '</tr>';
 						}
 
-						if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int')) {
-							// Add line with link to add new file or attach line to an existing file
-							$colspan = 10;
-							if (!empty($conf->projet->enabled)) {
-								$colspan++;
-							}
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-								$colspan++;
-							}
+						print '</tr>';
+					}
 
-							print '<tr class="tredited">';
+					if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int')) {
+						// Add line with link to add new file or attach line to an existing file
+						$colspan = 10;
+						if (!empty($conf->projet->enabled)) {
+							$colspan++;
+						}
+						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+							$colspan++;
+						}
 
-							print '<td class="center">';
-							print $numline;
-							print '</td>';
+						print '<tr class="tredited">';
 
-							print '<td colspan="'.($colspan - 1).'" class="liste_titre">';
-							print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
-							print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+						print '<td class="center">';
+						print $numline;
+						print '</td>';
+
+						print '<td colspan="'.($colspan - 1).'" class="liste_titre">';
+						print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
+						print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+						print '</a>';
+						if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+							print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
+							print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 							print '</a>';
-							if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
-								print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
-								print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-								print '</a>';
-							}
+						}
 
-							print '<!-- Code to open/close section to submit or link files in edit mode -->'."\n";
-							print '<script language="javascript">'."\n";
-							print '$(document).ready(function() {
+						print '<!-- Code to open/close section to submit or link files in edit mode -->'."\n";
+						print '<script language="javascript">'."\n";
+						print '$(document).ready(function() {
         				        $( ".auploadnewfilenow" ).click(function() {
         				            jQuery(".truploadnewfilenow").toggle();
                                     jQuery(".trattachnewfilenow").hide();
@@ -2199,134 +2198,134 @@ if ($action == 'create') {
                                     jQuery(".truploadnewfilenow").hide();
                                     return false;
                                 });';
-							if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array'))) {
-								print 'jQuery(".trattachnewfilenow").toggle();'."\n";
-							}
-							print '
+						if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array'))) {
+							print 'jQuery(".trattachnewfilenow").toggle();'."\n";
+						}
+						print '
                         		jQuery("form[name=\"expensereport\"]").submit(function() {
                             		if (jQuery(".truploadnewfilenow").is(":hidden")) {
                                 		jQuery("input[name=\"sendit\"]").val("");
                             		}
                         		});
                     		';
-							print '
+						print '
                             });
         				    ';
-							print '</script>'."\n";
-							print '</td></tr>';
+						print '</script>'."\n";
+						print '</td></tr>';
 
-							$filenamelinked = '';
-							if ($line->fk_ecm_files > 0) {
-								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-								if ($result > 0) {
-									$filenamelinked = $ecmfilesstatic->filename;
-								}
+						$filenamelinked = '';
+						if ($line->fk_ecm_files > 0) {
+							$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
+							if ($result > 0) {
+								$filenamelinked = $ecmfilesstatic->filename;
 							}
-
-							$tredited = 'tredited';
-							include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
-							include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
-
-							print '<tr class="oddeven tredited">';
-
-							print '<td></td>';
-
-							// Select date
-							print '<td class="center">';
-							print $form->selectDate($line->date, 'date');
-							print '</td>';
-
-							// Select project
-							if (!empty($conf->projet->enabled)) {
-								print '<td>';
-								$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
-								print '</td>';
-							}
-
-							// Select type
-							print '<td class="center">';
-							print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
-							print '</td>';
-
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-								print '<td class="fk_c_exp_tax_cat">';
-								$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
-								print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
-								print '</td>';
-							}
-
-							// Add comments
-							print '<td>';
-							print '<textarea name="comments" class="flat_ndf centpercent">'.dol_escape_htmltag($line->comments, 0, 1).'</textarea>';
-							print '</td>';
-
-							// VAT
-							print '<td class="right">';
-							print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $line->vatrate), $mysoc, '', 0, 0, '', false, 1);
-							print '</td>';
-
-							// Unit price
-							print '<td class="right">';
-							print '<input type="text" min="0" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag(price2num($line->value_unit_ht)).'" />';
-							print '</td>';
-
-							// Unit price with tax
-							print '<td class="right">';
-							print '<input type="text" min="0" class="right maxwidth50" id="value_unit" name="value_unit" value="'.dol_escape_htmltag(price2num($line->value_unit)).'" />';
-							print '</td>';
-
-							// Quantity
-							print '<td class="right">';
-							print '<input type="number" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($line->qty).'" />';
-							print '</td>';
-
-							//print '<td class="right">'.$langs->trans('AmountHT').'</td>';
-							//print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-
-							// Picture
-							print '<td class="center">';
-							//print $line->fk_ecm_files;
-							print '</td>';
-
-							print '<td class="center">';
-							print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
-							print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-							print '<br><input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-							print '</td>';
-
-							print '</tr>';
 						}
 
-						$i++;
-					}
-				}
+						$tredited = 'tredited';
+						include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
+						include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
 
-				// Add a new line
-				if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
-					&& $action != 'editline'
-					&& $user->rights->expensereport->creer) {
+						print '<tr class="oddeven tredited">';
+
+						print '<td></td>';
+
+						// Select date
+						print '<td class="center">';
+						print $form->selectDate($line->date, 'date');
+						print '</td>';
+
+						// Select project
+						if (!empty($conf->projet->enabled)) {
+							print '<td>';
+							$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+							print '</td>';
+						}
+
+						// Select type
+						print '<td class="center">';
+						print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
+						print '</td>';
+
+						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+							print '<td class="fk_c_exp_tax_cat">';
+							$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
+							print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
+							print '</td>';
+						}
+
+						// Add comments
+						print '<td>';
+						print '<textarea name="comments" class="flat_ndf centpercent">'.dol_escape_htmltag($line->comments, 0, 1).'</textarea>';
+						print '</td>';
+
+						// VAT
+						print '<td class="right">';
+						print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $line->vatrate), $mysoc, '', 0, 0, '', false, 1);
+						print '</td>';
+
+						// Unit price
+						print '<td class="right">';
+						print '<input type="text" min="0" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag(price2num($line->value_unit_ht)).'" />';
+						print '</td>';
+
+						// Unit price with tax
+						print '<td class="right">';
+						print '<input type="text" min="0" class="right maxwidth50" id="value_unit" name="value_unit" value="'.dol_escape_htmltag(price2num($line->value_unit)).'" />';
+						print '</td>';
+
+						// Quantity
+						print '<td class="right">';
+						print '<input type="number" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($line->qty).'" />';
+						print '</td>';
+
+						//print '<td class="right">'.$langs->trans('AmountHT').'</td>';
+						//print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+
+						// Picture
+						print '<td class="center">';
+						//print $line->fk_ecm_files;
+						print '</td>';
+
+						print '<td class="center">';
+						print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
+						print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+						print '<br><input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+						print '</td>';
+
+						print '</tr>';
+					}
+
+					$i++;
+				}
+			}
+
+			 // Add a new line
+			if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
+				&& $action != 'editline'
+				&& $user->rights->expensereport->creer) {
 					$colspan = 11;
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						$colspan++;
-					}
-					if (!empty($conf->projet->enabled)) {
-						$colspan++;
-					}
-					if ($action != 'editline') {
-						$colspan++;
-					}
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					$colspan++;
+				}
+				if (!empty($conf->projet->enabled)) {
+					$colspan++;
+				}
+				if ($action != 'editline') {
+					$colspan++;
+				}
 
 					$nbFiles = $nbLinks = 0;
 					$arrayoffiles = array();
-					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
-						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-						require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-						require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-						$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
-						$arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
-						$nbFiles = count($arrayoffiles);
-						$nbLinks = Link::count($db, $object->element, $object->id);
-					}
+				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+					$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
+					$arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
+					$nbFiles = count($arrayoffiles);
+					$nbLinks = Link::count($db, $object->element, $object->id);
+				}
 
 					// Add line with link to add new file or attach to an existing file
 					print '<tr class="liste_titre">';
@@ -2334,11 +2333,11 @@ if ($action == 'create') {
 					print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 					print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 					print '</a>';
-					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
-						print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
-						print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-						print '</a>';
-					}
+				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+					print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
+					print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+					print '</a>';
+				}
 
 					print '<!-- Code to open/close section to submit or link files in the form to add new line -->'."\n";
 					print '<script language="javascript">'."\n";
@@ -2360,9 +2359,9 @@ if ($action == 'create') {
                             jQuery(".truploadnewfilenow").hide();
                             return false;
                         });'."\n";
-					if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
-						print 'jQuery(".trattachnewfilenow").show();'."\n";
-					}
+				if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
+					print 'jQuery(".trattachnewfilenow").show();'."\n";
+				}
 					print '
 						jQuery("form[name=\"expensereport\"]").submit(function() {
 							if (jQuery(".truploadnewfilenow").is(":hidden")) {
@@ -2380,19 +2379,19 @@ if ($action == 'create') {
 					print '</script>'."\n";
 					print '</td></tr>';
 
-					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 
 					print '<tr class="liste_titre">';
 					print '<td></td>';
 					print '<td class="center">'.$langs->trans('Date').'</td>';
-					if (!empty($conf->projet->enabled)) {
-						print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
-					}
+				if (!empty($conf->projet->enabled)) {
+					print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
+				}
 					print '<td class="center">'.$langs->trans('Type').'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						print '<td>'.$langs->trans('CarCategory').'</td>';
-					}
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					print '<td>'.$langs->trans('CarCategory').'</td>';
+				}
 					print '<td>'.$langs->trans('Description').'</td>';
 					print '<td class="right">'.$langs->trans('VAT').'</td>';
 					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
@@ -2415,23 +2414,23 @@ if ($action == 'create') {
 					print '</td>';
 
 					// Select project
-					if (!empty($conf->projet->enabled)) {
-						print '<td>';
-						$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
-						print '</td>';
-					}
+				if (!empty($conf->projet->enabled)) {
+					print '<td>';
+					$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+					print '</td>';
+				}
 
 					// Select type
 					print '<td class="center">';
 					print $formexpensereport->selectTypeExpenseReport($fk_c_type_fees, 'fk_c_type_fees', 1);
 					print '</td>';
 
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						print '<td class="fk_c_exp_tax_cat">';
-						$params = array('fk_expense' => $object->id);
-						print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0);
-						print '</td>';
-					}
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					print '<td class="fk_c_exp_tax_cat">';
+					$params = array('fk_expense' => $object->id);
+					print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0);
+					print '</td>';
+				}
 
 					// Add comments
 					print '<td>';
@@ -2441,9 +2440,9 @@ if ($action == 'create') {
 					// Select VAT
 					print '<td class="right">';
 					$defaultvat = -1;
-					if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
-						$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
-					}
+				if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
+					$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
+				}
 					print $form->load_tva('vatrate', ($vatrate != '' ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
 					print '</td>';
 
@@ -2465,15 +2464,15 @@ if ($action == 'create') {
 					// Picture
 					print '<td></td>';
 
-					if ($action != 'editline') {
-						print '<td class="right"></td>';
-						print '<td class="right"></td>';
-					}
+				if ($action != 'editline') {
+					print '<td class="right"></td>';
+					print '<td class="right"></td>';
+				}
 
 					print '<td class="center"><input type="submit" value="'.$langs->trans("Add").'" name="bouton" class="button"></td>';
 
 					print '</tr>';
-				} // Fin si c'est payé/validé
+			} // Fin si c'est payé/validé
 
 				print '</table>';
 				print '</div>';
@@ -2501,11 +2500,15 @@ if ($action == 'create') {
 				print '</form>';
 
 				print dol_get_fiche_end();
-			}
-		} else {
-			dol_print_error($db);
 		}
+	} else {
+		dol_print_error($db);
 	}
+} else {
+	print 'Record not found';
+
+	llxFooter();
+	exit(1);
 }
 
 /*
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 640f4c17b5d..42be03263a8 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -18,6 +18,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 		$modulepart = 'expensereport'; $maxheightmini = 48;
 		$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
 		$filei = 0;
+		// Loop on each attached file
 		foreach ($arrayoffiles as $file) {
 			$urlforhref = array();
 			$filei++;
@@ -77,7 +78,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 				}
 
 				if (empty($urlforhref) || empty($thumbshown)) {
-					print '<a href="#" class="aphoto" target="_blank">';
+					print '<span href="" class="aphoto" target="_blank">';
 				} else {
 					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 				}
@@ -85,7 +86,12 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
 				print $thumbshown ? $thumbshown : img_mime($minifile);
 
-				print '</div></a>';
+				print '</div>';
+				if (empty($urlforhref) || empty($thumbshown)) {
+					print '</span>';
+				} else {
+					print '</a>';
+				}
 			}
 			print '<br>';
 			$checked = '';
@@ -106,7 +112,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 			if (!empty($filenamelinked) && $filenamelinked == $file['relativename']) {
 				$checked = ' checked';
 			}
-			print '<div class="margintoponly maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
+			print '<div class="margintoponly minwidth150 maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
 			print '<label class="wordbreak checkboxattachfilelabel" for="radio'.$filei.'"> '.$file['relativename'].'</label>';
 			print '</div>';