lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option FICHINTER_DISABLE_DETAILS

Browse Source
This commit is contained in:
Laurent Destailleur 2014-06-28 18:43:36 +02:00
parent a8e4391887
commit 0e36295e12
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/fichinter/fiche.php
View File

@ -701,7 +701,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
$filename = $attachedfiles['names']; $filename = $attachedfiles['names'];
$mimetype = $attachedfiles['mimes']; $mimetype = $attachedfiles['mimes'];
// Envoi de la propal // Send by email
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
if ($mailfile->error) if ($mailfile->error)
@ -1301,7 +1301,7 @@ else if ($id > 0 || ! empty($ref))
} }
} }
print "</table><br>"; print "</table>";
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{ {
@ -1318,7 +1318,6 @@ else if ($id > 0 || ! empty($ref))
} }
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">';
@ -1347,6 +1346,7 @@ else if ($id > 0 || ! empty($ref))
if ($num) if ($num)
{ {
print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -1451,7 +1451,7 @@ else if ($id > 0 || ! empty($ref))
$db->free($resql); $db->free($resql);
// Add new line // 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 '<br><table class="noborder" width="100%">'; if (! $num) print '<br><table class="noborder" width="100%">';
@ -1520,7 +1520,7 @@ else if ($id > 0 || ! empty($ref))
if ($action != 'editdescription' && ($action != 'presend')) if ($action != 'editdescription' && ($action != 'presend'))
{ {
// Validate // 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 '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=validate"'; print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=validate"';
print '>'.$langs->trans("Valid").'</a></div>'; print '>'.$langs->trans("Valid").'</a></div>';
@ -1623,7 +1623,7 @@ else if ($id > 0 || ! empty($ref))
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/')); $fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
$file=$fileparams['fullname']; $file=$fileparams['fullname'];
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';