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

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php

htdocs/contact/card.php

@@ -376,6 +376,8 @@ if (empty($reshook))
 			$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 			if ($ret < 0) $error++;
 
+			if (! $error)
+			{
                 $result = $object->update($contactid, $user);
 
     			if ($result > 0) {
@@ -393,6 +395,7 @@ if (empty($reshook))
     				$action = 'edit';
     			}
 			}
+        }
 
         if (! $error && empty($errors))
         {
@@ -505,7 +508,7 @@ else
             $linkback='';
             print load_fiche_titre($title, $linkback, 'title_companies.png');
 
-            // Affiche les erreurs
+            // Show errors
             dol_htmloutput_errors(is_numeric($error)?'':$error, $errors);
 
             if ($conf->use_javascript_ajax)
@@ -800,8 +803,8 @@ else
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
 
-            // Affiche les erreurs
+			// Show errors
-            dol_htmloutput_errors($error, $errors);
+			dol_htmloutput_errors(is_numeric($error)?'':$error, $errors);
 
             if ($conf->use_javascript_ajax)
             {
@@ -1122,11 +1125,10 @@ else
     {
         $objsoc = new Societe($db);
 
-        /*
+        // View mode
-         * Fiche en mode visualisation
-         */
 
-        dol_htmloutput_errors($error, $errors);
+        // Show errors
+        dol_htmloutput_errors(is_numeric($error)?'':$error, $errors);
 
         dol_fiche_head($head, 'card', $title, -1, 'contact');
 

htdocs/core/class/commonobject.class.php

@@ -3876,9 +3876,16 @@ abstract class CommonObject
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
 		$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-		foreach($dirtpls as $reldir)
+		foreach($dirtpls as $module => $reldir)
+		{
+			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
+			}
+			else
+			{
+				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php';
+			}
 			if (empty($conf->file->strict_mode)) {
 				$res=@include $tpl;
 			} else {
@@ -4131,9 +4138,16 @@ abstract class CommonObject
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
 			$dirtpls=array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-			foreach($dirtpls as $reldir)
+			foreach($dirtpls as $module => $reldir)
+			{
+				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
+				}
+				else
+				{
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
+				}
 				if (empty($conf->file->strict_mode)) {
 					$res=@include $tpl;
 				} else {
@@ -4154,9 +4168,16 @@ abstract class CommonObject
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
 			$dirtpls=array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-			foreach($dirtpls as $reldir)
+			foreach($dirtpls as $module => $reldir)
+			{
+				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
+				}
+				else
+				{
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php';
+				}
 				if (empty($conf->file->strict_mode)) {
 					$res=@include $tpl;
 				} else {
@@ -4356,9 +4377,16 @@ abstract class CommonObject
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
 		$dirtpls=array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-		foreach($dirtpls as $reldir)
+		foreach($dirtpls as $module => $reldir)
+		{
+			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
+			}
+			else
+			{
+				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php';
+			}
 			if (empty($conf->file->strict_mode)) {
 				$res=@include $tpl;
 			} else {

htdocs/core/class/extrafields.class.php

@@ -1970,7 +1970,7 @@ class ExtraFields
 	public function setOptionalsFromPost($extralabels, &$object, $onlykey = '')
 	{
 		global $_POST, $langs;
-		$nofillrequired='';// For error when required field left blank
+		$nofillrequired=0;// For error when required field left blank
 		$error_field_required = array();
 
 		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
@@ -2001,7 +2001,8 @@ class ExtraFields
 				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
+				    if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
+				        || (! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
 						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];

htdocs/install/mysql/migration/8.0.0-9.0.0.sql

@@ -270,8 +270,8 @@ CREATE TABLE llx_pos_cash_fence(
 
 
 -- Withdrawals / Prelevements
-UPDATE llx_const set name = 'PRELEVEMENT_END_TO_END' where name = 'END_TO_END';
+UPDATE llx_const set name = __ENCRYPT('PRELEVEMENT_END_TO_END')__ where name = __ENCRYPT('END_TO_END')__;
-UPDATE llx_const set name = 'PRELEVEMENT_USTRD' where name = 'USTRD';
+UPDATE llx_const set name = __ENCRYPT('PRELEVEMENT_USTRD')__ where name = __ENCRYPT('USTRD')__;
 
 
 -- Delete duplicate accounting account, but only if not used