Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

dev/setup/codesniffer/ruleset.xml

@@ -432,5 +432,5 @@
     <rule ref="PSR2.Classes.ClassDeclaration" />
     <rule ref="PSR2.Methods.FunctionClosingBrace" />
     <rule ref="PSR2.Files.EndFileNewline.TooMany" />
-
+    <rule ref="PSR2.Files.EndFileNewline.NoneFound" />
 </ruleset>

htdocs/accountancy/journal/purchasesjournal.php

@@ -94,7 +94,7 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)
 
 $idpays = $mysoc->country_id;
 
-$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
+$sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";

htdocs/admin/perms.php

@@ -220,4 +220,4 @@ dol_fiche_end();
 
 // End of page
 llxFooter();
-$db->close();
+$db->close();

htdocs/blockedlog/ajax/check_signature.php

@@ -57,4 +57,4 @@ $url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s
 
 $res = file_get_contents($url);
 //echo $url;
-echo $res;
+echo $res;

htdocs/comm/mailing/class/mailing.class.php

@@ -319,6 +319,7 @@ class Mailing extends CommonObject
 		if ($result < 0)
 		{
 			$this->error=$object->error;
+			$this->errors=array_merge($this->errors, $object->errors);
 			$error++;
 		}
 

htdocs/comm/propal/class/propal.class.php

@@ -1285,7 +1285,12 @@ class Propal extends CommonObject
 		// Create clone
 		$object->context['createfromclone']='createfromclone';
 		$result=$object->create($user);
-		if ($result < 0) $error++;
+		if ($result < 0)
+		{
+		    $this->error = $object->error;
+		    $this->errors = array_merge($this->errors, $object->errors);
+		    $error++;
+		}
 
 		if (! $error)
 		{

htdocs/compta/cashcontrol/class/cashcontrol.class.php

@@ -426,4 +426,4 @@ class CashControl extends CommonObject
 
 		return $result;
 	}
-}
+}

htdocs/core/actions_comments.inc.php

@@ -73,4 +73,4 @@ if ($action == 'deletecomment')
 			$action='';
 		}
 	}
-}
+}

htdocs/core/class/commonobject.class.php

@@ -5015,7 +5015,7 @@ abstract class CommonObject
 			   		if ($this->array_options[$key] === '') $mandatorypb=true;
 			   		if ($mandatorypb)
 			   		{
-			   			dol_syslog($this->error);
+			   		    dol_syslog("Mandatory extra field ".$key." is empty");
 			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);
 			   			return -1;
 			   		}

htdocs/core/class/emailsenderprofile.class.php

@@ -447,4 +447,4 @@ class EmailSenderProfileLine
 	// @var mixed Sample line property 2
 	public $prop2;
 }
-*/
+*/

htdocs/core/lib/fiscalyear.lib.php

@@ -53,4 +53,4 @@ function fiscalyear_prepare_head(Fiscalyear $object)
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear','remove');
 
 	return $head;
-}
+}

htdocs/core/modules/modDon.class.php

@@ -162,4 +162,4 @@ class modDon extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-}
+}

htdocs/core/modules/modSupplierProposal.class.php

@@ -257,4 +257,4 @@ class modSupplierProposal extends DolibarrModules
 
 	    return $this->_remove($sql, $options);
 	}
-}
+}

htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php

@@ -519,4 +519,4 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 		return -1;
 	}
-}
+}

htdocs/core/modules/reception/mod_reception_beryl.php

@@ -143,4 +143,4 @@ class mod_reception_beryl extends ModelNumRefReception
 		// phpcs:enable
 		return $this->getNextValue($objsoc,$objforref);
 	}
-}
+}

htdocs/core/modules/reception/mod_reception_moonstone.php

@@ -134,4 +134,4 @@ class mod_reception_moonstone extends ModelNumRefReception
 		// phpcs:enable
 		return $this->getNextValue($objsoc,$objforref);
 	}
-}
+}

htdocs/core/modules/syslog/logHandler.php

@@ -97,4 +97,4 @@ class LogHandler
 	{
 		$this->ident+=$ident;
 	}
-}
+}

htdocs/core/modules/syslog/logHandlerInterface.php

@@ -83,4 +83,4 @@ interface LogHandlerInterface
 	 * 	@return	void
 	 */
 	public function export($content);
-}
+}

htdocs/core/modules/syslog/mod_syslog_syslog.php

@@ -124,4 +124,4 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 		syslog($content['level'], $content['message']);
 		closelog();
 	}
-}
+}

htdocs/core/tpl/advtarget.tpl.php

@@ -527,4 +527,4 @@ print '<script type="text/javascript" language="javascript">
 		print '</tr>';
 		print '</table>';
 		print '</form>';
-		print '<br>';
+		print '<br>';

htdocs/core/tpl/extrafields_list_search_input.tpl.php

@@ -45,4 +45,4 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 			}
 		}
 	}
-}
+}

htdocs/core/tpl/extrafields_list_search_title.tpl.php

@@ -26,4 +26,4 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 			}
 		}
 	}
-}
+}

htdocs/datapolicy/class/datapolicycron.class.php

@@ -518,4 +518,4 @@ class DataPolicyCron
         $contacts->getAllAdherentsNotInformed();
         return true;
     }
-}
+}

htdocs/product/class/productbatch.class.php

@@ -356,6 +356,7 @@ class Productbatch extends CommonObject
 		if ($result < 0)
 		{
 			$this->error=$object->error;
+			$this->errors=array_merge($this->errors, $object->errors);
 			$error++;
 		}
 

htdocs/product/class/productcustomerprice.class.php

@@ -924,7 +924,8 @@ class Productcustomerprice extends CommonObject
 		// Other options
 		if ($result < 0) {
 			$this->error = $object->error;
-			$error ++;
+			$this->errors=array_merge($this->errors, $object->errors);
+			$error++;
 		}
 
 		if (! $error) {

htdocs/product/class/propalmergepdfproduct.class.php

@@ -589,6 +589,7 @@ class Propalmergepdfproduct extends CommonObject
 		if ($result < 0)
 		{
 			$this->error=$object->error;
+			$this->errors=array_merge($this->errors, $object->errors);
 			$error++;
 		}
 

htdocs/reception/class/reception.class.php

@@ -1973,4 +1973,4 @@ class Reception extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
-}
+}

htdocs/takepos/ajax.php

@@ -59,4 +59,4 @@ if ($action=="search"){
 		$rows[] = $row;
 	}
 	echo json_encode($rows);
-}
+}

htdocs/user/class/api_users.class.php

@@ -197,7 +197,9 @@ class Users extends DolibarrApi
 	 *
 	 * @param int   $id             Id of account to update
 	 * @param array $request_data   Datas
-	 * @return int
+	 * @return array
+     *
+     * @throws 	RestException
 	 */
     function put($id, $request_data = null)
     {

htdocs/variants/ajax/get_attribute_values.php

@@ -57,4 +57,4 @@ if ($res == -1) {
 	exit();
 }
 
-print json_encode($res);
+print json_encode($res);

htdocs/variants/class/ProductAttribute.class.php

@@ -346,4 +346,4 @@ class ProductAttribute
 
 		return 1;
 	}
-}
+}

htdocs/variants/class/ProductAttributeValue.class.php

@@ -226,4 +226,4 @@ class ProductAttributeValue
 
 		return -1;
 	}
-}
+}

htdocs/variants/class/ProductCombination2ValuePair.class.php

@@ -157,4 +157,4 @@ WHERE c2v.fk_prod_combination = ".(int) $fk_combination;
 
 		return -1;
 	}
-}
+}