Browse Source

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Laurent Destailleur 5 năm trước cách đây
mục cha
commit
60eabb0e8a
2 tập tin đã thay đổi với 1 bổ sung7 xóa
  1. 1 6
      htdocs/accountancy/index.php
  2. 0 1
      test/test_serialize.php

+ 1 - 6
htdocs/accountancy/index.php

@@ -66,7 +66,7 @@ if ($conf->accounting->enabled)
 
     $resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
-	$helpisexpanded = empty($resultboxes['boxactivated']); // If there is no widget, the tooltip help is expanded by default.
+    $helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
 	$showtutorial = '';
 
 	if (!$helpisexpanded)
@@ -222,10 +222,6 @@ if ($conf->accounting->enabled)
     $boxlist .= '<div class="twocolumns">';
 
     $boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
-    if (!empty($nbworkboardcount))
-    {
-        $boxlist .= $boxwork;
-    }
 
     $boxlist .= $resultboxes['boxlista'];
 
@@ -233,7 +229,6 @@ if ($conf->accounting->enabled)
 
     $boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
 
-    $boxlist .= $boxstat;
     $boxlist .= $resultboxes['boxlistb'];
 
     $boxlist .= '</div>';

+ 0 - 1
test/test_serialize.php

@@ -48,4 +48,3 @@ print "\n";
 print "\n";
 
 //print print_r(unserialize(serialize($object)));
-