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

Fix: deliveray date must not be mandatory

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-17 19:08:33 +00:00
parent cf1052977e
commit 2fa26555de
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/menubase.class.php
View File

@ -20,7 +20,7 @@
/** /**
* \file htdocs/core/class/menubase.class.php * \file htdocs/core/class/menubase.class.php
* \ingroup core * \ingroup core
* \version $Id: menubase.class.php,v 1.26 2011/07/17 19:56:51 hregis Exp $ * \version $Id: menubase.class.php,v 1.25 2011/07/13 22:18:48 eldy Exp $
* \brief File of class to manage dynamic menu entries * \brief File of class to manage dynamic menu entries
* \remarks Initialy built by build_class_from_table on 2008-01-12 14:19 * \remarks Initialy built by build_class_from_table on 2008-01-12 14:19
*/ */
@ -577,12 +577,11 @@ class Menubase
$tabMenu[$b][0] = $menu['rowid']; $tabMenu[$b][0] = $menu['rowid'];
$tabMenu[$b][1] = $menu['fk_menu']; $tabMenu[$b][1] = $menu['fk_menu'];
$tabMenu[$b][2] = $menu['url']; $tabMenu[$b][2] = $menu['url'];
// FIXME idmenu is already added in auguria.lib.php if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2]))
/*if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2]))
{ {
if (preg_match('/\?/',$tabMenu[$b][2])) $tabMenu[$b][2].='&idmenu='.$menu['rowid']; if (preg_match('/\?/',$tabMenu[$b][2])) $tabMenu[$b][2].='&idmenu='.$menu['rowid'];
else $tabMenu[$b][2].='?idmenu='.$menu['rowid']; else $tabMenu[$b][2].='?idmenu='.$menu['rowid'];
}*/ }
$tabMenu[$b][3] = $chaine; $tabMenu[$b][3] = $chaine;
$tabMenu[$b][5] = $menu['target']; $tabMenu[$b][5] = $menu['target'];
$tabMenu[$b][6] = $menu['leftmenu']; $tabMenu[$b][6] = $menu['leftmenu'];