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

Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php

htdocs/fourn/class/fournisseur.facture.class.php

@@ -155,7 +155,7 @@ class FactureFournisseur extends CommonInvoice
 
 	/**
 	 * @deprecated
-	 * @see note_private, note_public
+	 * @see $note_private, $note_public
 	 */
     public $note;
 
@@ -1573,8 +1573,8 @@ class FactureFournisseur extends CommonInvoice
      *	@param    	double	$qty             	Quantite
      *	@param    	int		$fk_product      	Product/Service ID predefined
      *	@param    	double	$remise_percent  	Percentage discount of the line
-     *	@param    	date	$date_start      	Date de debut de validite du service
-     * 	@param    	date	$date_end        	Date de fin de validite du service
+     *	@param    	integer	$date_start      	Date de debut de validite du service
+     * 	@param    	integer	$date_end        	Date de fin de validite du service
      * 	@param    	string	$ventil          	Code de ventilation comptable
      *	@param    	int		$info_bits			Bits de type de lines
      *	@param    	string	$price_base_type 	HT ou TTC
@@ -1616,7 +1616,7 @@ class FactureFournisseur extends CommonInvoice
 			if (!preg_match('/\((.*)\)/', $txtva)) {
 				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
 			}
-			
+
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
 				$this->error=$langs->trans('ErrorStartDateGreaterEnd');
@@ -1833,8 +1833,8 @@ class FactureFournisseur extends CommonInvoice
      * @param		int			$type				Type of line (0=product, 1=service)
      * @param     	double		$remise_percent  	Percentage discount of the line
      * @param		int			$notrigger			Disable triggers
-     * @param      	timestamp	$date_start     	Date start of service
-     * @param      	timestamp   $date_end       	Date end of service
+     * @param      	integer 	$date_start     	Date start of service
+     * @param      	integer     $date_end       	Date end of service
 	 * @param		array		$array_options		extrafields array
      * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * @param		double		$pu_ht_devise		Amount in currency
@@ -1855,7 +1855,7 @@ class FactureFournisseur extends CommonInvoice
         // Check parameters
         //if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
         if ($type < 0) return -1;
-        
+
         if ($date_start && $date_end && $date_start > $date_end) {
             $langs->load("errors");
             $this->error=$langs->trans('ErrorStartDateGreaterEnd');
@@ -2707,7 +2707,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 	/**
 	 * @deprecated
-	 * @see product_ref
+	 * @see $product_ref
 	 */
 	public $ref;
 
@@ -2726,7 +2726,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 	/**
 	 * @deprecated
-	 * @see label
+	 * @see $label
 	 */
 	public $libelle;
 
@@ -2740,7 +2740,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 * Unit price before taxes
 	 * @var float
 	 * @deprecated Use $subprice
-	 * @see subprice
+	 * @see $subprice
 	 */
 	public $pu_ht;
 
@@ -2756,7 +2756,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 * Total VAT amount
 	 * @var float
 	 * @deprecated Use $total_tva instead
-	 * @see total_tva
+	 * @see $total_tva
 	 */
 	public $tva;
 

htdocs/fourn/class/fournisseur.product.class.php

@@ -57,7 +57,7 @@ class ProductFournisseur extends Product
 
     /**
      * @deprecated
-     * @see ref_supplier
+     * @see $ref_supplier
      */
     public $fourn_ref;
     public $delivery_time_days;
@@ -1078,7 +1078,7 @@ class ProductFournisseur extends Product
      * Private function to log price history
      *
      * @param User      $user                           Object user who adds/changes price
-     * @param date      $datec                          date create
+     * @param integer   $datec                          date create
      * @param float     $buyprice                       price for qty
      * @param float     $qty                            qty for price
      * @param float     $multicurrency_buyprice         Purchase price for the quantity min in currency

htdocs/product/list.php

@@ -831,7 +831,7 @@ if ($resql)
 		// Label
 		if (! empty($arrayfields['p.label']['checked']))
 		{
-			print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 70).'</td>';
+			print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}
 

htdocs/projet/list.php

@@ -722,7 +722,7 @@ while ($i < min($num, $limit))
 		// Title
 		if (! empty($arrayfields['p.title']['checked']))
 		{
-			print '<td class="tdoverflowmax100">';
+			print '<td class="tdoverflowmax200">';
 			print dol_trunc($obj->title, 80);
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;