diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 720ba5db41f..deb4aa0541f 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -25,6 +25,7 @@ require("./pre.inc.php"); include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); $langs->load("admin"); @@ -39,6 +40,10 @@ $boxes = array(); /* * Actions */ +if ((isset($_POST["action"]) && $_POST["action"] == 'addconst')) +{ + dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"]); +} if ($_POST["action"] == 'add') { @@ -373,6 +378,26 @@ if ($resql) print '
'; + +# Affiche ligne d'ajout +print ''; + +$var=false; +print ''; +print ''; +print "\n"; +print '\n"; +print ''; +print ''; + +print '
"; +print $langs->trans("MaxNbOfLinesForBoxes")."'; +print ''; +print ''; +print '
'; +print "
'; + + $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 19318058a89..e7fb659f477 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -15,15 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/admin/const.php \ingroup setup \brief Page d'administration/configuration des constantes autres - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 79320133f40..a962ef3d67f 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -364,6 +364,10 @@ class Conf // securite if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; + // conf->box_max_lines + $this->box_max_lines=5; + if (isset($conf->global->MAIN_BOXES_MAXLINES)) $this->box_max_lines=$conf->global->MAIN_BOXES_MAXLINES; + // conf->use_preview_tabs $this->use_preview_tabs=0; if (isset($this->global->MAIN_USE_PREVIEW_TABS)) $this->use_preview_tabs=$this->global->MAIN_USE_PREVIEW_TABS; diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php index fc425463e46..4f5759804fb 100644 --- a/htdocs/includes/boxes/box_clients.php +++ b/htdocs/includes/boxes/box_clients.php @@ -16,15 +16,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/includes/boxes/box_clients.php \ingroup societes \brief Module de génération de l'affichage de la box clients + \version $Id$ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");