From 0553e331fe80813d0673a738a857b450b8e1b5c9 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Tue, 14 Nov 2017 08:48:41 +0100
Subject: [PATCH] Update card.php

Normalize link and generate document
---
 htdocs/expensereport/card.php | 42 ++++++++++++++---------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index dc2c0a22f66..3db8e30f9f4 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2391,47 +2391,39 @@ if (GETPOST('modelselected')) {
 
 if ($action != 'presend')
 {
-	print '<div class="fichehalfleft">';
 
 	/*
 	 * Generate documents
 	 */
 
-	if($user->rights->expensereport->export && $action != 'create' && $action != 'edit')
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
+
+	if($user->rights->expensereport->creer && $action != 'create' && $action != 'edit')
 	{
 		$filename	=	dol_sanitizeFileName($object->ref);
 		$filedir	=	$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
 		$urlsource	=	$_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed	=	$user->rights->expensereport->export;
-		$delallowed	=	$user->rights->expensereport->export;
+		$genallowed	=	$user->rights->expensereport->creer;
+		$delallowed	=	$user->rights->expensereport->creer;
 		$var 		= 	true;
-		print $formfile->showdocuments('expensereport',$filename,$filedir,$urlsource,$genallowed,$delallowed);
+		print $formfile->showdocuments('expensereport', $filename, $filedir, $urlsource, $genallowed, $delallowed);
 		$somethingshown = $formfile->numoffiles;
 	}
 
-	print '</div>';
-
 	if ($action != 'create' && $action != 'edit' && ($id || $ref))
 	{
-	    $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
-		include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
-
-	    // Link invoice to intervention
-	    if (GETPOST('LinkedFichinter')) {
-	        $object->fetch($id);
-	        $object->fetch_thirdparty();
-	        $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
-	    }
-
-	    // Show links to link elements
-	    $linktoelements=array();
-	    if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION))
-	    {
-	        $linktoelements[]='fichinter';
-	        $linktoelem = $form->showLinkToObjectBlock($object, $linktoelements, array('expensereport'));
-	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	    }
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('expensereport'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 	}
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	// List of actions on element
+	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	$formactions = new FormActions($db);
+	$somethingshown = $formactions->showactions($object, 'expensereport', null);
+
+	print '</div></div></div>';
+
 }
 
 // Presend form