';
print '| '.img_object("",$picto[$const]).' | ';
print ''.$langs->trans($desc).' | ';
print '';
@@ -189,7 +189,7 @@ else
show_skin(null,1);
print '
'."\n";
- $listofmodes=array('dolibarr_mailings','dolibarr_notes','dolibarr_details','Full');
+ $listofmodes=array('dolibarr_mailings','dolibarr_notes','dolibarr_details','dolibarr_readonly','Full');
$linkstomode='';
foreach($listofmodes as $newmode)
{
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index a67407b818c..926a3651362 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005-2014 Regis Houssin
* Copyright (C) 2008 Raphael Bertrand (Resultic)
* Copyright (C) 2011-2013 Juanjo Menent
- * Copyright (C) 2011-2015 Philippe Grand
+ * Copyright (C) 2011-2017 Philippe Grand
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
@@ -50,6 +51,9 @@ $type='ficheinter';
/*
* Actions
*/
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
if ($action == 'updateMask')
{
$maskconst=GETPOST('maskconst','alpha');
@@ -113,35 +117,6 @@ else if ($action == 'specimen') // For fiche inter
}
}
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
- $post_size=count($_POST);
-
- $db->begin();
-
- for($i=0;$i < $post_size;$i++)
- {
- if (array_key_exists('param'.$i,$_POST))
- {
- $param=GETPOST("param".$i,'alpha');
- $value=GETPOST("value".$i,'alpha');
- if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
- if (! $res > 0) $error++;
- }
- }
- if (! $error)
- {
- $db->commit();
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- }
- else
- {
- $db->rollback();
- setEventMessages($langs->trans("Error"), null, 'errors');
- }
-}
-
// Activate a model
else if ($action == 'set')
{
@@ -185,7 +160,7 @@ else if ($action == 'setmod')
else if ($action == 'set_FICHINTER_FREE_TEXT')
{
- $freetext= GETPOST('FICHINTER_FREE_TEXT'); // No alpha here, we want exact string
+ $freetext= GETPOST('FICHINTER_FREE_TEXT','none'); // No alpha here, we want exact string
$res = dolibarr_set_const($db, "FICHINTER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
@@ -265,7 +240,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setu
$head=fichinter_admin_prepare_head();
-dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), 0, 'intervention');
+dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'intervention');
// Interventions numbering model
@@ -291,7 +266,6 @@ foreach ($dirmodels as $reldir)
$handle = opendir($dir);
if (is_resource($handle))
{
- $var=true;
while (($file = readdir($handle))!==false)
{
@@ -310,8 +284,8 @@ foreach ($dirmodels as $reldir)
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
- $var=!$var;
- print '| '.$module->nom." | \n";
+
+ print ' | | '.$module->nom." | \n";
print $module->info();
print ' | ';
@@ -410,7 +384,6 @@ print " \n";
clearstatcache();
-$var=true;
foreach ($dirmodels as $reldir)
{
$dir = dol_buildpath($reldir."core/modules/fichinter/doc/");
@@ -433,7 +406,7 @@ foreach ($dirmodels as $reldir)
{
if (file_exists($dir.'/'.$file))
{
- $var=!$var;
+
$name = substr($file, 4, dol_strlen($file) -16);
$classname = substr($file, 0, dol_strlen($file) -12);
@@ -447,7 +420,7 @@ foreach ($dirmodels as $reldir)
if ($modulequalified)
{
- print '| ';
+ print ' | | ';
print (empty($module->name)?$name:$module->name);
print " | \n";
if (method_exists($module,'info')) print $module->info($langs);
@@ -532,14 +505,18 @@ print ' | '.$langs->trans("Parameter").' | ';
print ''.$langs->trans("Value").' | ';
print " | \n";
print " \n";
-$var=true;
-$var=! $var;
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = ''.$langs->trans("AvailableVariables").':
';
+foreach($substitutionarray as $key => $val) $htmltext.=$key.'
';
+$htmltext.='';
+
print '';
//Use draft Watermark
-$var=!$var;
+
print "';
// print products on fichinter
-$var=! $var;
print ' |