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

Conflicts: htdocs/langs/en_US/errors.lang
Dolibarr · Feb 8, 2018 · 26ee7ec · 26ee7ec
2 parents 493a9a7 + d10d9f0
commit 26ee7ec
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
@@ -1047,7 +1047,7 @@ function initAsSpecimen($option='')
 	 */
 	function getNomUrl($withpicto=0, $option='', $mode='withlistofinvoices', $notooltip=0)
 	{
-		global $langs;
+		global $conf, $langs;
 
 		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 

diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
@@ -653,9 +653,10 @@ function update_fk_bank($id_bank)
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			link option
      *  @param	int  	$notooltip		1=Disable tooltip
+     *  @param	string	$morecss		More CSS
 	 *	@return	string					Chaine with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0)
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, morecss='')
 	{
 		global $langs, $conf;
 

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
@@ -1205,7 +1205,7 @@ function delete($user)
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return int     		   	 <0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user, $notrigger=0)
 	{
 		global $conf, $langs;
 		$error=0;

diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
@@ -162,6 +162,7 @@ function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page =
         {
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
+            $i = 0;
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
@@ -73,7 +73,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please ennter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD) 
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD) 
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
@@ -261,6 +261,8 @@ function merge($id, $idtodelete)
     {
     	global $db, $hookmanager;
 
+    	$error = 0;
+
     	if ($id == $idtodelete)
     	{
     		throw new RestException(400, 'Try to merge a thirdparty into itself');

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
@@ -3793,7 +3793,7 @@ public function setCategories($categories, $type)
 	 */
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
-		if ($origin_id == $id)
+		if ($origin_id == $dest_id)
 		{
 			dol_syslog('Error: Try to merge a thirdparty into itself');
 			return false;