From 0e36295e12bfb3cf22e3c0452bbdcac880692969 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Jun 2014 18:43:36 +0200 Subject: [PATCH] Add option FICHINTER_DISABLE_DETAILS --- htdocs/fichinter/fiche.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 00d4e35df8e..a66fb341cff 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -701,7 +701,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $filename = $attachedfiles['names']; $mimetype = $attachedfiles['mimes']; - // Envoi de la propal + // Send by email require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1); if ($mailfile->error) @@ -1301,7 +1301,7 @@ else if ($id > 0 || ! empty($ref)) } } - print "
"; + print ""; if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { @@ -1318,7 +1318,6 @@ else if ($id > 0 || ! empty($ref)) } - print '
'; print ''; print ''; @@ -1347,6 +1346,7 @@ else if ($id > 0 || ! empty($ref)) if ($num) { + print '
'; print ''; print ''; @@ -1451,7 +1451,7 @@ else if ($id > 0 || ! empty($ref)) $db->free($resql); // Add new line - if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline') + if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS)) { if (! $num) print '
'; @@ -1520,7 +1520,7 @@ else if ($id > 0 || ! empty($ref)) if ($action != 'editdescription' && ($action != 'presend')) { // Validate - if ($object->statut == 0 && $user->rights->ficheinter->creer && count($object->lines) > 0) + if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) { print ''; @@ -1623,7 +1623,7 @@ else if ($id > 0 || ! empty($ref)) include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/')); $file=$fileparams['fullname']; - + // Define output language $outputlangs = $langs; $newlang = '';