diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 1bcbec9723d..4b03cb48429 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -66,11 +66,9 @@ $var=false;
print '
\n";
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index f9fe17ac1c2..8aa5ce64655 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -67,11 +67,9 @@ $var=false;
print '
\n";
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 3a7b5667db5..c3972bab2f7 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -79,12 +79,10 @@ if (! empty($conf->contrat->enabled))
print '\n";
print "
";
}
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 1cafd091521..9623958188d 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -205,14 +205,15 @@ function print_end_menu_array_auguria()
* @param DoliDB $db Database handler
* @param array $menu_array_before Table of menu entries to show before entries of menu handler
* @param array $menu_array_after Table of menu entries to show after entries of menu handler
- * @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param Menu $menu Object Menu to return back list of menu entries
* @param int $noout Disable output (Initialise &$menu only).
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
* @param string $forceleftmenu 'all'=Force leftmenu to '' (= all)
+ * @param array $moredata An array with more data to output
* @return int Nb of entries
*/
-function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='')
+function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='',$moredata=null)
{
global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
@@ -245,6 +246,16 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
print ''."\n";
}
+ if (is_array($moredata) && ! empty($moredata['searchform']))
+ {
+ print "\n";
+ print "\n";
+ print ''."\n";
+ print "\n";
+ }
+
// We update newmenu with entries found into database
$menuArbo = new Menubase($db,'auguria');
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
@@ -348,7 +359,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
// Show menu
if (empty($noout))
{
- $alt=0; $blockvmenuopened=false;
+ $alt=0; $altok=0; $blockvmenuopened=false;
$num=count($menu_array);
for ($i = 0; $i < $num; $i++)
{
@@ -358,14 +369,15 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
$alt++;
if (empty($menu_array[$i]['level']) && $showmenu)
{
+ $altok++;
$blockvmenuopened=true;
- if (($alt%2==0))
+ if ($altok % 2 == 0)
{
- print '