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

Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php

build/debian/copyright

@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: http://www.dolibarr.org/files/stable/standard/
+Source: https://www.dolibarr.org/files/stable/standard/
 
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>

htdocs/adherents/card.php

@@ -257,6 +257,7 @@ if (empty($reshook))
 		}
 		$lastname=$_POST["lastname"];
 		$firstname=$_POST["firstname"];
+		$societe=$_POST["societe"];
 		$morphy=$_POST["morphy"];
 		$login=$_POST["login"];
 		if ($morphy != 'mor' && empty($lastname)) {

htdocs/core/class/utils.class.php

@@ -268,7 +268,8 @@ class Utils
 		        {
 		            $i++;   // output line number
 		            $read = fgets($handlein);
-		            if ($i == 1 && preg_match('/'.preg_quote('Warning: Using a password').'/i', $read)) continue;
+		            // Exclude warning line we don't want
+		            if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
 		            fwrite($handle,$read);
 		            if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
 		            elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;

htdocs/core/lib/functions.lib.php

@@ -7,7 +7,7 @@
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)       <raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2016 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.fr>
@@ -2500,9 +2500,9 @@ function img_printer($titlealt = "default", $other='')
 /**
  *	Show help logo with cursor "?"
  *
- * 	@param	string	$usehelpcursor		Use help cursor
+ * 	@param	int              	$usehelpcursor		Use help cursor
- * 	@param	string	$usealttitle		Text to use as alt title
+ * 	@param	int|string	        $usealttitle		Text to use as alt title
- * 	@return string      				Retourne tag img
+ * 	@return string            	           			Return tag img
  */
 function img_help($usehelpcursor = 1, $usealttitle = 1)
 {
@@ -3600,7 +3600,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 	$vatratecleaned = $vatrate;
 	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
 	{
-        $vatratecleaned = $reg[1];
+        $vatratecleaned = trim($reg[1]);
 	    $vatratecode = $reg[2];
 	}
 	
@@ -3614,7 +3614,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 	{
 		if ($local == 1)
 		{
-			if (! $mysoc->localtax1_assuj) return 0;
+			if (! $mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (! $thirdparty_buyer->localtax1_assuj) return 0;
@@ -3627,7 +3627,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 
 		if ($local == 2)
 		{
-			if (! $mysoc->localtax2_assuj) return 0;
+			if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (! $thirdparty_buyer->localtax2_assuj) return 0;
@@ -3899,7 +3899,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
  *  @param	int			$idprod          	Id of product or 0 if not a predefined product
  *  @param  Societe		$thirdparty_seller  Thirdparty with a ->country_code defined (FR, US, IT, ...)
  *	@param	int			$idprodfournprice	Id product_fournisseur_price (for "supplier" order/invoice)
- *  @return int					         	<0 if KO, Vat rate if OK
+ *  @return float					        Vat rate
  *  @see get_product_localtax_for_country
  */
 function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice=0)
@@ -4049,7 +4049,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
  *	@param  Societe		$thirdparty_buyer   	Objet societe acheteuse
  *	@param  int			$idprod					Id product
  *	@param	int			$idprodfournprice		Id product_fournisseur_price (for supplier order/invoice)
- *	@return float         				      	Taux de tva a appliquer, -1 si ne peut etre determine
+ *	@return float         				      	Vat rate to use, -1 if we can't guess it
  *  @see get_default_npr, get_default_localtax
  */
 function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod=0, $idprodfournprice=0)
@@ -4598,7 +4598,7 @@ function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
 	else $pattern = '/(<br[^>]*>)/U';							// /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-	$nblines = floor((count($a)+1)/2);
+	$nblines = (int) floor((count($a)+1)/2);
 	// count possible auto line breaks
 	if($maxlinesize)
 	{

htdocs/core/modules/export/export_excel.modules.php

@@ -64,6 +64,10 @@ class ExportExcel extends ModeleExports
         $this->picto='mime/xls';					// Picto
 		$this->version='1.30';             // Driver version
 
+		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+		
+		if (empty($this->disabled))
+		{
     		// If driver use an external library, put its name here
     		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
@@ -80,8 +84,7 @@ class ExportExcel extends ModeleExports
     			$this->label_lib='PhpExcel';
                 $this->version_lib='1.8.0';		// No way to get info from library
     		}
-
+		}
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 
 		$this->row=0;
 	}

htdocs/core/modules/export/export_excel2007.modules.php

@@ -64,6 +64,10 @@ class ExportExcel2007 extends ExportExcel
         $this->picto='mime/xls';			// Picto
 		$this->version='1.30';             // Driver version
 
+		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+		
+		if (empty($this->disabled))
+		{
     		// If driver use an external library, put its name here
     		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
@@ -80,8 +84,7 @@ class ExportExcel2007 extends ExportExcel
     			$this->label_lib='PhpExcel';
                 $this->version_lib='1.8.0';		// No way to get info from library
     		}
-		
+		}
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 		
 		$this->row=0;
 	}

htdocs/core/modules/export/modules_export.php

@@ -65,10 +65,12 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
     				$moduleid=$reg[1];
 
     				// Loading Class
-    				$file = $dir."/export_".$moduleid.".modules.php";
+    				$file = $dir."export_".$moduleid.".modules.php";
     				$classname = "Export".ucfirst($moduleid);
 
     				require_once $file;
+    				if (class_exists($classname))
+    				{
         				$module = new $classname($db);
     
         				// Picto
@@ -80,7 +82,7 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
         				// If use an external lib
         				$this->liblabel[$module->id]=$module->getLibLabel();
         				$this->libversion[$module->id]=$module->getLibVersion();
-
+    				}
     				$i++;
     			}
     		}

htdocs/don/list.php

@@ -73,8 +73,6 @@ $fieldstosearchall = array(
     'd.firstname'=>'Firstname',
 );
         
-
-    
 /*
  * View
  */
@@ -115,6 +113,12 @@ if (trim($search_name) != '')
 if ($search_amount) $sql.= natural_search(array('d.amount'), price2num(trim($search_amount)), 1);
 
 $sql.= $db->order($sortfield,$sortorder);
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
 $sql.= $db->plimit($limit+1, $offset);
 
 $resql = $db->query($sql);
@@ -124,18 +128,18 @@ if ($resql)
 	$i = 0;
 
 	$param = '&statut='.$statut;
-    if ($page > 0) $param.= '&page='.$page;
+    //if ($page > 0) $param.= '&page='.$page;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
 	if ($statut >= 0)
 	{
 	    $donationstatic->statut=$statut;
 	    $label=$donationstatic->getLibStatut(0);
-		print_barre_liste($label, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
+		print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num,$nbtotalofrecords);
 	}
 	else
 	{
-		print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
+		print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num,$nbtotalofrecords);
 	}
 
 
@@ -200,7 +204,7 @@ if ($resql)
 	$var=True;
 	while ($i < min($num,$limit))
 	{
-		$objp = $db->fetch_object($result);
+		$objp = $db->fetch_object($resql);
 		$var=!$var;
 		print "<tr ".$bc[$var].">";
 		$donationstatic->id=$objp->rowid;

htdocs/expedition/class/expedition.class.php

@@ -1967,6 +1967,7 @@ class Expedition extends CommonObject
 	 */
 	function set_billed()
 	{
+	    global $user;
 		$error=0;
 
 		$this->db->begin();

htdocs/fichinter/card.php

@@ -946,6 +946,7 @@ if ($action == 'create')
 
 	if ($socid > 0)
 	{
+		$soc=new Societe($db);
 		$soc->fetch($socid);
 
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';

htdocs/includes/tcpdi/tcpdi_parser.php

@@ -48,7 +48,8 @@
  */
 
 // include class for decoding filters
-require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+if (defined('TCPDF_PATH')) require_once(constant('TCPDF_PATH').'/include/tcpdf_filters.php');
+else require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
 
 if (!defined ('PDF_TYPE_NULL'))
     define ('PDF_TYPE_NULL', 0);

htdocs/product/stats/card.php

@@ -211,9 +211,9 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 		//print '<table width="100%">';
 
 		// Generation des graphs
+    	$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
 		if ($object->id > 0)  // We are on statistics for a dedicated product
 		{
-    		$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
     		if (! file_exists($dir.'/'.$object->id))
     		{
     			if (dol_mkdir($dir.'/'.$object->id) < 0)

htdocs/projet/class/task.class.php

@@ -59,6 +59,8 @@ class Task extends CommonObject
     var $timespent_fk_user;
     var $timespent_note;
 
+    public $oldcopy;
+
 
     /**
      *  Constructor
@@ -317,6 +319,30 @@ class Task extends CommonObject
         	}
         }
 
+        if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
+        {
+            // We remove directory
+            if ($conf->projet->dir_output)
+            {
+                $project = new Project($this->db);
+                $project->fetch($this->fk_project);
+
+                $olddir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->oldcopy->ref);
+                $newdir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
+                if (file_exists($olddir))
+                {
+                    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+                    $res=dol_move($olddir, $newdir);
+                    if (! $res)
+                    {
+                        $langs->load("errors");
+                        $this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
+                        $error++;
+                    }
+                }
+            }
+        }
+
         // Commit or rollback
         if ($error)
         {

htdocs/projet/tasks/task.php

@@ -82,6 +82,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
 	if (! $error)
 	{
 		$object->fetch($id,$ref);
+        $object->oldcopy = clone $object;
 
 		$tmparray=explode('_',$_POST['task_parent']);
 		$task_parent=$tmparray[1];