Fix look and feel v7

htdocs/compta/facture/class/api_invoices.class.php

@@ -390,15 +390,6 @@ class Invoices extends DolibarrApi
     	{
     		throw new RestException(405, $this->invoice->error);
     	}
-
-    	/*$result = $this->invoice->fetch($id);
-
-    	$this->invoice->getLinesArray();
-    	$result = array();
-    	foreach ($this->invoice->lines as $line) {
-    		array_push($result,$this->_cleanObjectDatas($line));
-    	}*/
-    	return $result;
     }
 
     /**

htdocs/core/lib/functions.lib.php

@@ -1278,7 +1278,7 @@ function dol_get_fiche_end($notab=0)
  *  Show tab footer of a card.
  *  Note: $object->next_prev_filter can be set to restrict select to find next or previous record by $form->showrefnav.
  *
- *  @param	object	$object			Object to show
+ *  @param	Object	$object			Object to show
  *  @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link
  *  @param	string	$morehtml  		More html content to output just before the nav bar
  *  @param	int		$shownav	  	Show Condition (navigation is shown if value is 1)

htdocs/expedition/class/api_shipments.class.php

@@ -155,6 +155,7 @@ class Shipments extends DolibarrApi
         {
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
+            $i=0;
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);

htdocs/product/stock/class/entrepot.class.php

@@ -607,8 +607,11 @@ class Entrepot extends CommonObject
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+        $result .= $linkstart;
-		$result.=$linkstart.($showfullpath ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label)).$linkend;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= ($showfullpath ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label));
+        $result .= $linkend;
+
 		return $result;
 	}
 

htdocs/product/stock/class/productlot.class.php

@@ -483,7 +483,6 @@ class Productlot extends CommonObject
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-
         $result = '';
 
         $label = '<u>' . $langs->trans("Batch") . '</u>';
@@ -498,18 +497,39 @@ class Productlot extends CommonObject
             $label.= '<br><b>' . $langs->trans('SellByDate') . ':</b> ' . dol_print_date($this->sellby, 'day');
         }
 
-        $link = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$this->id.'"';
+        $url = DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$this->id;
-        $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
-        $link.= '>';
-		$linkend='</a>';
 
-        if ($withpicto)
+        if ($option != 'nolink')
         {
-            $result.=($link.img_object(($notooltip?'':$label), 'barcode', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        	// Add param to save lastsearch_values or not
-            if ($withpicto != 2) $result.=' ';
+        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		}
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		$result.= $link . $this->batch . $linkend;
+        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-		return $result;
+        }
+
+        $linkclose='';
+        if (empty($notooltip))
+        {
+        	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        	{
+        		$label=$langs->trans("ShowMyObject");
+        		$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+        	}
+        	$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+        	$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
+        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+        $linkend='</a>';
+
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= $this->batch;
+        $result .= $linkend;
+
+        return $result;
 	}
 
 

htdocs/product/stock/mouvement.php

@@ -865,6 +865,12 @@ if ($resql)
     {
         $objp = $db->fetch_object($resql);
 
+        $userstatic->id=$objp->fk_user_author;
+        $userstatic->login=$objp->login;
+        $userstatic->lastname=$objp->lastname;
+        $userstatic->firstname=$objp->firstname;
+        $userstatic->photo=$objp->photo;
+
         $productstatic->id=$objp->rowid;
         $productstatic->ref=$objp->product_ref;
         $productstatic->label=$objp->produit;
@@ -942,11 +948,6 @@ if ($resql)
         if (! empty($arrayfields['m.fk_user_author']['checked']))
         {
 	        print '<td class="tdoverflowmax100">';
-	        $userstatic->id=$objp->fk_user_author;
-	        $userstatic->login=$objp->login;
-	        $userstatic->lastname=$objp->lastname;
-	        $userstatic->firstname=$objp->firstname;
-	        $userstatic->photo=$objp->photo;
 	        print $userstatic->getNomUrl(-1);
 	        print "</td>\n";
         }