Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/core/class/utils.class.php

htdocs/core/class/utils.class.php

@@ -328,18 +328,19 @@ class Utils
 				{
 					$handlein = popen($fullcommandclear, 'r');
 					$i=0;
-					while (!feof($handlein))
-					{
-						$i++;   // output line number
-						$read = fgets($handlein);
-						// 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;
+					if ($handlein) {
+						while (!feof($handlein))
+						{
+							$i++;   // output line number
+							$read = fgets($handlein);
+							// 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;
+						}
+						pclose($handlein);
 					}
-					pclose($handlein);
-
 				}
 
 

htdocs/expensereport/class/expensereport.class.php

@@ -2123,7 +2123,7 @@ class ExpenseReport extends CommonObject
         $sql = "SELECT DISTINCT ur.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
         $sql.= " WHERE ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'";                                              // Permission 'Approve';
-        $sql.= "UNION";
+        $sql.= " UNION";
         $sql.= " SELECT DISTINCT ugu.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
         $sql.= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'";       // Permission 'Approve';

htdocs/societe/class/societe.class.php

@@ -3275,6 +3275,7 @@ class Societe extends CommonObject
 		$this->phone=$member->phone;       // Prof phone
 		$this->email=$member->email;
 		$this->skype=$member->skype;
+		$this->entity=$member->entity;
 
 		$this->client = 1;				// A member is a customer by default
 		$this->code_client = ($customercode?$customercode:-1);
@@ -3778,7 +3779,7 @@ class Societe extends CommonObject
 
 					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
-				
+
                 //if credit note is converted but not used
                 if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE  && $tmpobject->isCreditNoteUsed())$outstandingOpened-=$tmpobject->getSumFromThisCreditNotesNotUsed();