diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 008006b8fa5..2a5bb0acbca 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -124,9 +124,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 				$ret .= '</div>'."\n";
-			}
-			else
-			{
+			} else {
 				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
@@ -135,9 +133,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 			}
-		}
-		else
-		{
+		} else {
 			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 			if ($help) {
@@ -190,9 +186,7 @@ class Form
 		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
-		}
-		else
-		{
+		} else {
 			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
 			{
 				$ret .= "\n";
@@ -206,14 +200,12 @@ class Form
 				{
 					$tmp = explode(':', $typeofdata);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^(numeric|amount)/', $typeofdata))
+				} elseif (preg_match('/^(numeric|amount)/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata);
 					$valuetoshow = price2num($editvalue ? $editvalue : $value);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
 				{
 					$tmp = explode(':', $typeofdata);
 					$cols = $tmp[2];
@@ -231,16 +223,13 @@ class Form
 					$valuetoshow = str_replace('&', '&amp;', $valuetoshow);
 					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
 					$ret .= '</textarea>';
-				}
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif (preg_match('/^select;/', $typeofdata))
+				} elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -251,8 +240,7 @@ class Form
 						$arraylist[$tmpkey] = $tmp[1];
 					}
 					$ret .= $this->selectarray($htmlname, $arraylist, $value);
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -270,9 +258,7 @@ class Form
 
 				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
 				$ret .= '</form>'."\n";
-			}
-			else
-			{
+			} else {
 				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
 				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
 				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
@@ -289,8 +275,7 @@ class Form
 						$arraylist[$tmp[0]] = $tmp[1];
 					}
 					$ret .= $arraylist[$value];
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmpcontent = dol_htmlentitiesbr($value);
 					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -302,8 +287,7 @@ class Form
 					// We dont use dol_escape_htmltag to get the html formating active, but this need we must also
 					// clean data from some dangerous html
 					$ret .= dol_string_onlythesehtmltags(dol_htmlentitiesbr($tmpcontent));
-				}
-				else {
+				} else {
 					$ret .= dol_escape_htmltag($value);
 				}
 
@@ -368,6 +352,8 @@ class Form
 
 				$s = picto_from_langcode($langcode, 'class="pictoforlang paddingright"');
 				$resultforextrlang .= $s;
+
+				// TODO Use the showInputField() method of ExtraLanguages object
 				if ($typeofdata == 'textarea') {
 					$resultforextrlang .= '<textarea name="field-'.$object->element."-".$fieldname."-".$langcode.'" id="'.$fieldname."-".$langcode.'" class="'.$morecss.'" rows="'.ROWS_2.'" wrap="soft">';
 					$resultforextrlang .= $valuetoshow;
@@ -439,8 +425,7 @@ class Form
 				if (!empty($tmp[1])) $inputOption = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				$out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
-			}
-			elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
+			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
@@ -448,22 +433,19 @@ class Form
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 
 				$out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
-			}
-			elseif (preg_match('/^(select|autocomplete)/', $inputType))
+			} elseif (preg_match('/^(select|autocomplete)/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $loadmethod = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				if (!empty($tmp[3])) $button_only = true;
-			}
-			elseif (preg_match('/^textarea/', $inputType))
+			} elseif (preg_match('/^textarea/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
 				$rows = (empty($tmp[1]) ? '8' : $tmp[1]);
 				$cols = (empty($tmp[2]) ? '80' : $tmp[2]);
-			}
-			elseif (preg_match('/^ckeditor/', $inputType))
+			} elseif (preg_match('/^ckeditor/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $toolbar = $tmp[1];
@@ -474,9 +456,7 @@ class Form
 				if (!empty($conf->fckeditor->enabled))
 				{
 					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
-				}
-				else
-				{
+				} else {
 					$inputType = 'textarea';
 				}
 			}
@@ -495,9 +475,7 @@ class Form
 						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
 						if (!empty($custommsg['error']))
 							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
-				}
-				else
-					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+				} else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
 			}
 			if ($inputType == 'textarea') {
 				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
@@ -505,9 +483,7 @@ class Form
 			}
 			$out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";
 			$out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";
-		}
-		else
-		{
+		} else {
 			$out = $value;
 		}
 
@@ -555,9 +531,7 @@ class Form
 		if ($tooltiptrigger == '')
 		{
 			$htmltext = str_replace('"', '&quot;', $htmltext);
-		}
-		else
-		{
+		} else {
 			$classfortooltip = 'classfortooltiponclick';
 			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
 		}
@@ -566,15 +540,13 @@ class Form
 			$paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
 			if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
 			else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if ($tooltipon == 1 || $tooltipon == 3)
 		{
 			$paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
 			if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
 			else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if (empty($notabs)) $s .= '<table class="nobordernopadding"><tr style="height: auto;">';
 		elseif ($notabs == 2) $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
 		// Define value if value is before
@@ -629,8 +601,7 @@ class Form
 		if (empty($conf->use_javascript_ajax))
 		{
 			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable')	return $text;
-			else
-			{
+			else {
 				$alt = $htmltext;
 				$htmltext = '';
 			}
@@ -676,7 +647,7 @@ class Form
 
 		$disabled = 0;
 		$ret = '<div class="centpercent center">';
-                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
+                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle alignstart" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
 
 		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
 		$parameters = array();
@@ -742,17 +713,18 @@ class Form
                         urlform = urlform + "#show_files";
     	            }
         			$( this ).closest("form").attr("action", urlform);
-                    console.log("we select a mass action "+massaction+" - "+urlform);
+                    console.log("we select a mass action name='.$name.' massaction="+massaction+" - "+urlform);
         	        /* Warning: if you set submit button to disabled, post using Enter will no more work if there is no other button */
         			if ($(this).val() != \'0\')
     	  			{
                                         jQuery(".' . $name . 'confirmed").prop(\'disabled\', false);
-                                        jQuery(".' . $name . 'other").show();
+										jQuery(".' . $name . 'other").hide();	/* To disable if another div was open */
+                                        jQuery(".' . $name . '"+massaction).show();
     	  			}
     	  			else
     	  			{
                                         jQuery(".' . $name . 'confirmed").prop(\'disabled\', true);
-                                        jQuery(".' . $name . 'other").hide();
+										jQuery(".' . $name . 'other").hide();	/* To disable any div open */
     	  			}
     	        });
         	});
@@ -856,9 +828,7 @@ class Form
 					{
 						$foundselected = true;
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
 					}
 					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
@@ -868,9 +838,7 @@ class Form
 				}
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -947,9 +915,7 @@ class Form
 					if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))
 					{
 						$out .= '<option value="'.$row['rowid'].'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
@@ -966,9 +932,7 @@ class Form
 			{
 				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1073,9 +1037,7 @@ class Form
 			asort($this->cache_types_fees);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1194,9 +1156,7 @@ class Form
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
-		}
-		else
-		{
+		} else {
 			// Immediate load of all database
 			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);
 		}
@@ -1326,9 +1286,7 @@ class Form
 							$label .= $obj->code_fournisseur.' - ';
 						}
 						$label .= ' '.$obj->name;
-					}
-					else
-					{
+					} else {
 						$label = $obj->name;
 					}
 
@@ -1357,14 +1315,10 @@ class Form
 						if (in_array($obj->rowid, $selected))
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else
-					{
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -1373,9 +1327,7 @@ class Form
 				}
 			}
 			$out .= '</select>'."\n";
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1455,9 +1407,7 @@ class Form
 			}
 			print '</select>';
 			return $qualifiedlines;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1587,9 +1537,7 @@ class Form
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
-							}
-							else
-							{
+							} else {
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= '>';
@@ -1598,9 +1546,7 @@ class Form
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
 							}
-						}
-						else
-						{
+						} else {
 							if (in_array($obj->rowid, $selected))
 							{
 								$out .= $contactstatic->getFullName($langs);
@@ -1611,9 +1557,7 @@ class Form
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';
 				$out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
 				$out .= '</option>';
@@ -1637,9 +1581,7 @@ class Form
 
 			$this->num = $num;
 			return $out;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1713,8 +1655,7 @@ class Form
 		{
 			// Build list includeUsers to have only hierarchy
 			$includeUsers = implode(",", $user->getAllChildIds(0));
-		}
-		elseif ($include == 'hierarchyme')
+		} elseif ($include == 'hierarchyme')
 		{
 			// Build list includeUsers to have only hierarchy and current user
 			$includeUsers = implode(",", $user->getAllChildIds(1));
@@ -1735,17 +1676,13 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";
 			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE u.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 			{
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
-			}
-			else
-			{
+			} else {
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
 		}
@@ -1762,9 +1699,7 @@ class Form
 		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 		{
 			$sql .= " ORDER BY u.firstname ASC";
-		}
-		else
-		{
+		} else {
 			$sql .= " ORDER BY u.lastname ASC";
 		}
 
@@ -1803,9 +1738,7 @@ class Form
 						$out .= '<option value="'.$obj->rowid.'"';
 						if ($disableline) $out .= ' disabled';
 						$out .= ' selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$obj->rowid.'"';
 						if ($disableline) $out .= ' disabled';
 						$out .= '>';
@@ -1845,9 +1778,7 @@ class Form
 						{
 							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
 							$moreinfo++;
-						}
-						else
-						{
+						} else {
 							$out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
 							$moreinfo++;
 						}
@@ -1862,16 +1793,12 @@ class Form
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';
 				$out .= '<option value="">'.$langs->trans("None").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1916,9 +1843,7 @@ class Form
 		if ($action == 'view')
 		{
 			$out .= '';
-		}
-		else
-		{
+		} else {
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
 			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
@@ -2008,8 +1933,7 @@ class Form
 		if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
 				$filtertype = '0';
-			}
-			elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+			} elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$filtertype = '1';
 			}
 		}
@@ -2031,8 +1955,7 @@ class Form
 			{
 				if (empty($conf->product->enabled)) { // when product module is disabled, show services only
 					$filtertype = 1;
-				}
-				elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+				} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 					$filtertype = 0;
 				}
 			}
@@ -2128,9 +2051,7 @@ class Form
 			if ($hidelabel == 3) {
 				print img_picto($langs->trans("Search"), 'search');
 			}
-		}
-		else
-		{
+		} else {
 			print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
 	}
@@ -2194,9 +2115,7 @@ class Form
 		if (count($warehouseStatusArray))
 		{
 		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
-		}
-		else
-		{
+		} else {
 		    $selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
 		}
 
@@ -2286,13 +2205,11 @@ class Form
 		if ($finished == 0)
 		{
 			$sql .= " AND p.finished = ".$finished;
-		}
-		elseif ($finished == 1)
+		} elseif ($finished == 1)
 		{
 			$sql .= " AND p.finished = ".$finished;
 			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;
-		}
-		elseif ($status >= 0)
+		} elseif ($status >= 0)
 		{
 			$sql .= " AND p.tosell = ".$status;
 		}
@@ -2300,8 +2217,7 @@ class Form
 		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;
 		elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
 			$sql .= " AND p.fk_product_type = 1";
-		}
-		elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 			$sql .= " AND p.fk_product_type = 0";
 		}
 		// Add criteria on ref/label
@@ -2342,9 +2258,7 @@ class Form
 			$sql .= " ORDER BY categorie_product_id ";
 			//ASC OR DESC order
 			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";
-		}
-		else
-		{
+		} else {
 			$sql .= $db->order("p.ref");
 		}
 
@@ -2378,9 +2292,7 @@ class Form
 			{
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
-			}
-			else
-			{
+			} else {
 			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 			}
 			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
@@ -2431,9 +2343,7 @@ class Form
 							array_push($outarray, $optJson);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
 						$price_product = new Product($this->db);
 						$price_product->fetch($objp->rowid, '', '', 1);
@@ -2465,9 +2375,7 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -2612,65 +2520,21 @@ class Form
 				$objp2 = $this->db->fetch_object($result2);
 				if ($objp2)
 				{
-					if ($price_level != 1 && $objp2->price == 0 && !empty($conf->global->PRODUIT_MULTIPRICES_USELEVEL1_IFLEVELVALISNUL)){
-						$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
-						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
-						$sql .= " WHERE fk_product='".$objp->rowid."'";
-						$sql .= " AND entity IN (".getEntity('productprice').")";
-						$sql .= " AND price_level=1";
-						$sql .= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
-						$sql .= " LIMIT 1";
-						dol_syslog(get_class($this).'::constructProductListOption search price for product '.$objp->rowid.' AND level '.$price_level.'', LOG_DEBUG);
-						$result2 = $this->db->query($sql);
-						if ($result2)
-						{
-							$objp2 = $this->db->fetch_object($result2);
-							if ($objp2)
-							{
-								$found = 1;
-								if ($objp2->price_base_type == 'HT')
-								{
-									//$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
-									//$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-								}
-								else
-								{
-									$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
-									$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
-								}
-								$outprice_ht = price($objp2->price);
-								$outprice_ttc = price($objp2->price_ttc);
-								$outpricebasetype = $objp2->price_base_type;
-								$outtva_tx = $objp2->tva_tx;
-							}
-						}
-						else
-						{
-							dol_print_error($this->db);
-						}
-					}
-					else
+					$found = 1;
+					if ($objp2->price_base_type == 'HT')
 					{
-						$found = 1;
-						if ($objp2->price_base_type == 'HT')
-						{
-							$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
-							$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-						}
-						else
-						{
-							$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
-							$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
-						}
-						$outprice_ht = price($objp2->price);
-						$outprice_ttc = price($objp2->price_ttc);
-						$outpricebasetype = $objp2->price_base_type;
-						$outtva_tx = $objp2->tva_tx;
+						$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
+						$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
+					} else {
+						$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
+						$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 					}
+					$outprice_ht = price($objp2->price);
+					$outprice_ttc = price($objp2->price_ttc);
+					$outpricebasetype = $objp2->price_base_type;
+					$outtva_tx = $objp2->tva_tx;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2687,9 +2551,7 @@ class Form
 				$outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";
 				$opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 				$outval .= $langs->transnoentities("Unit");
-			}
-			else
-			{
+			} else {
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -2723,9 +2585,7 @@ class Form
 				{
 					$opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 					$outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-				}
-				else
-				{
+				} else {
 					$opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 					$outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 				}
@@ -2744,9 +2604,7 @@ class Form
 			{
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-			}
-			else
-			{
+			} else {
 				$opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 				$outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 			}
@@ -2763,7 +2621,7 @@ class Form
 
     			if ($objp->stock > 0) {
     				$outval .= ' - <span class="product_line_stock_ok">';
-    			}elseif ($objp->stock <= 0) {
+    			} elseif ($objp->stock <= 0) {
     				$outval .= ' - <span class="product_line_stock_too_low">';
     			}
     			$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
@@ -2782,7 +2640,7 @@ class Form
     			    $outval .= ' - '.$langs->transnoentities("VirtualStock").':';
     			    if ($virtualstock > 0) {
     			        $outval .= ' - <span class="product_line_stock_ok">';
-    			    }elseif ($virtualstock <= 0) {
+    			    } elseif ($virtualstock <= 0) {
     			        $outval .= ' - <span class="product_line_stock_too_low">';
     			    }
     			    $outval .= $virtualstock;
@@ -2834,9 +2692,7 @@ class Form
 			$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
 			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';
-		}
-		else
-		{
+		} else {
 			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice, $morecss);
 		}
 	}
@@ -3045,9 +2901,7 @@ class Form
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/";
 						$optlabel .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 						$outvallabel .= $langs->transnoentities("Unit");
-					}
-					else
-					{
+					} else {
 						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$optlabel .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -3082,15 +2936,12 @@ class Form
 						$optlabel .= " - ".$reputations[$objp->supplier_reputation];
 						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];
 					}
-				}
-				else
-				{
+				} else {
 					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
-					}
-					else                                            // No supplier price defined for product, even on other suppliers
+					} else // No supplier price defined for product, even on other suppliers
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
@@ -3138,9 +2989,7 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3185,9 +3034,7 @@ class Form
 			if (!$num)
 			{
 				$form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
-			}
-			else
-			{
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 				$form .= '<option value="0">&nbsp;</option>';
 
@@ -3230,9 +3077,7 @@ class Form
 					if ($objp->quantity == 1)
 					{
 						$opt .= $langs->trans("Unit");
-					}
-					else
-					{
+					} else {
 						$opt .= $langs->trans("Units");
 					}
 					if ($objp->quantity > 1)
@@ -3251,9 +3096,7 @@ class Form
 			$form .= '</select>';
 			$this->db->free($result);
 			return $form;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3294,9 +3137,7 @@ class Form
 					if ($selected && $selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
 					}
 					$i++;
@@ -3304,9 +3145,7 @@ class Form
 			}
 			print '</select>';
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3353,9 +3192,7 @@ class Form
 			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3402,9 +3239,7 @@ class Form
 			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3434,9 +3269,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayavailability['label'];
@@ -3487,9 +3320,7 @@ class Form
 
 			unset($tmparray);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3520,9 +3351,7 @@ class Form
 			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
 			{
 				print '<option value="'.$arraydemandreason['id'].'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$arraydemandreason['id'].'">';
 			}
 			$label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason
@@ -3578,9 +3407,7 @@ class Form
 			$this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3620,9 +3447,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayconditions['label'];
@@ -3725,9 +3550,7 @@ class Form
 			if ($selected == $id)
 			{
 				$return .= '<option value="'.$id.'" selected>'.$value;
-			}
-			else
-			{
+			} else {
 				$return .= '<option value="'.$id.'">'.$value;
 			}
 			$return .= '</option>';
@@ -3842,35 +3665,33 @@ class Form
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture';
 		$sql .= ' WHERE entity IN ('.getEntity('invoice').')';
 		$sql .= ' AND situation_counter>=1';
+		$sql .= ' AND fk_soc = '.(int) $socid;
+		$sql .= ' AND type <> 2';
 		$sql .= ' ORDER by situation_cycle_ref, situation_counter desc';
 		$resql = $this->db->query($sql);
+
 		if ($resql && $this->db->num_rows($resql) > 0) {
 			// Last seen cycle
 			$ref = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
-				//Same company ?
-			    if ($socid == $obj->fk_soc) {
-					//Same cycle ?
-			        if ($obj->situation_cycle_ref != $ref) {
-						// Just seen this cycle
-			            $ref = $obj->situation_cycle_ref;
-						//not final ?
-			            if ($obj->situation_final != 1) {
-							//Not prov?
-			                if (substr($obj->ref, 1, 4) != 'PROV') {
-			                    if ($selected == $obj->rowid) {
-			                        $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
-								} else {
-								    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
-								}
+				//Same cycle ?
+		        if ($obj->situation_cycle_ref != $ref) {
+					// Just seen this cycle
+		            $ref = $obj->situation_cycle_ref;
+					//not final ?
+		            if ($obj->situation_final != 1) {
+						//Not prov?
+		                if (substr($obj->ref, 1, 4) != 'PROV') {
+		                    if ($selected == $obj->rowid) {
+		                        $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
+							} else {
+							    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
 							}
 						}
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 				dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 		}
 		if ($opt == '<option value ="" selected></option>')
@@ -3915,9 +3736,7 @@ class Form
 				if ($selected == $res->rowid)
 				{
 				    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
-				}
-				else
-				{
+				} else {
 				    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
 				}
 			}
@@ -3975,9 +3794,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->label);
@@ -3987,14 +3804,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -4047,9 +3861,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->name);
@@ -4058,14 +3870,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -4108,7 +3917,7 @@ class Form
 	 *    Return list of categories having choosed type
 	 *
 	 *    @param	string|int	            $type				Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element)
+	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.
 	 *    @param    string		            $htmlname			HTML field name
 	 *    @param    int			            $maxlength      	Maximum length for labels
      *    @param    int|string|array    	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
@@ -4156,11 +3965,8 @@ class Form
 					$i++;
 				}
 				$this->db->free($result);
-			}
-			else dol_print_error($this->db);
-		}
-		else
-		{
+			} else dol_print_error($this->db);
+		} else {
 			$cat = new Categorie($this->db);
             $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
 		}
@@ -4170,17 +3976,14 @@ class Form
 		if (is_array($cate_arbo))
 		{
 			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else
-			{
+			else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
 					if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
 					{
 						$add = 'selected ';
-					}
-					else
-					{
+					} else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';
@@ -4247,7 +4050,6 @@ class Form
     public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
 	{
 		global $langs, $conf;
-		global $useglobalvars;
 
 		$more = '<!-- formconfirm -->';
 		$formconfirm = '';
@@ -4294,19 +4096,16 @@ class Form
 					if ($input['type'] == 'text')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'password')
+					} elseif ($input['type'] == 'password')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'select')
+					} elseif ($input['type'] == 'select')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd tdtop left">';
 						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
 						$more .= '</div></div>'."\n";
-					}
-					elseif ($input['type'] == 'checkbox')
+					} elseif ($input['type'] == 'checkbox')
 					{
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
@@ -4316,8 +4115,7 @@ class Form
 						if (isset($input['disabled'])) $more .= ' disabled';
 						$more .= ' /></div>';
 						$more .= '</div>'."\n";
-					}
-					elseif ($input['type'] == 'radio')
+					} elseif ($input['type'] == 'radio')
 					{
 						$i = 0;
 						foreach ($input['values'] as $selkey => $selval)
@@ -4332,8 +4130,7 @@ class Form
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
-					}
-					elseif ($input['type'] == 'date')
+					} elseif ($input['type'] == 'date')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';
 						$more .= '<div class="tagtd">';
@@ -4344,16 +4141,13 @@ class Form
 						$formquestion[] = array('name'=>$input['name'].'year');
 						$formquestion[] = array('name'=>$input['name'].'hour');
 						$formquestion[] = array('name'=>$input['name'].'min');
-					}
-					elseif ($input['type'] == 'other')
+					} elseif ($input['type'] == 'other')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd">';
 						$more .= $input['value'];
 						$more .= '</div></div>'."\n";
-					}
-
-					elseif ($input['type'] == 'onecolumn')
+					} elseif ($input['type'] == 'onecolumn')
 					{
 						$moreonecolumn .= '<div class="margintoponly">';
 						$moreonecolumn .= $input['value'];
@@ -4395,7 +4189,7 @@ class Form
 					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko, $input['name']);
 				}
 			}
-			// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
+			// Show JQuery confirm box.
 			$formconfirm .= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
 			if (!empty($formquestion['text'])) {
 				$formconfirm .= '<div class="confirmtext">'.$formquestion['text'].'</div>'."\n";
@@ -4478,9 +4272,7 @@ class Form
             });
             </script>';
 			$formconfirm .= "<!-- end ajax formconfirm -->\n";
-		}
-		else
-		{
+		} else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
 
 			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
@@ -4563,18 +4355,14 @@ class Form
 			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
 			$out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$projet = new Project($this->db);
 				$projet->fetch($selected);
 				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
 				$out .= $projet->getNomUrl(0, '', 1);
-			}
-			else
-			{
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -4609,9 +4397,7 @@ class Form
 			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_conditions_paiements();
@@ -4644,9 +4430,7 @@ class Form
 			$this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_availability();
@@ -4678,9 +4462,7 @@ class Form
 			$this->selectInputReason($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->loadCacheInputReason();
@@ -4729,9 +4511,7 @@ class Form
 			$ret .= '</td>';
 			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
 			else $ret .= dol_print_date($selected, 'day');
 		}
@@ -4765,9 +4545,7 @@ class Form
 			print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -4805,9 +4583,7 @@ class Form
 			$this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_types_paiements();
@@ -4839,9 +4615,7 @@ class Form
 			print $this->selectMultiCurrency($selected, $htmlname, 0);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			dol_include_once('/core/lib/company.lib.php');
 			print !empty($selected) ? currency_name($selected, 1) : '&nbsp;';
 		}
@@ -4874,16 +4648,12 @@ class Form
 			print '</select> ';
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if (!empty($rate))
 			{
 				print price($rate, 1, $langs, 1, 0);
 				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
-			}
-			else
-			{
+			} else {
 				print 1;
 			}
 		}
@@ -4921,9 +4691,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'HasCreditNoteFromSupplier';
-				}
-				else
-				{
+				} else {
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
 					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
@@ -4932,9 +4700,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'CompanyHasCreditNote';
-				}
-				else
-				{
+				} else {
 					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
 					else $translationKey = 'CompanyHasCreditNote';
 				}
@@ -4972,15 +4738,11 @@ class Form
 				print '</div>';
 			}
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				print $selected;
-			}
-			else
-			{
+			} else {
 				print "0";
 			}
 		}
@@ -5018,9 +4780,7 @@ class Form
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -5062,18 +4822,14 @@ class Form
 			$out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);
 			$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$soc = new Societe($this->db);
 				$soc->fetch($selected);
 				$out .= $soc->getNomUrl($langs);
-			}
-			else
-			{
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -5121,18 +4877,14 @@ class Form
 			if ($selected && $selected == $code_iso)
 			{
 				$out .= '<option value="'.$code_iso.'" selected>';
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="'.$code_iso.'">';
 			}
 			$out .= $currency['label'];
 			if ($mode == 1)
 			{
 			    $out .= ' ('.$code_iso.')';
-			}
-			else
-			{
+			} else {
                 $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
 			}
 			$out .= '</option>';
@@ -5256,15 +5008,11 @@ class Form
 				}
 
 				return $num;
-			}
-			else
-			{
+			} else {
 				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = '<font class="error">'.$this->db->error().'</font>';
 			return -2;
 		}
@@ -5319,9 +5067,7 @@ class Form
 			if ($societe_vendeuse->id == $mysoc->id)
 			{
 				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';
-			}
-			else
-			{
+			} else {
 				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';
 			}
 			return $return;
@@ -5336,9 +5082,7 @@ class Form
 		if (is_object($societe_vendeuse))
 		{
 			$code_country = "'".$societe_vendeuse->country_code."'";
-		}
-		else
-		{
+		} else {
 			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente
 		}
 		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
@@ -5353,13 +5097,10 @@ class Form
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
-				}
-				elseif (!$idprod)  // We don't know type of product
+				} elseif (!$idprod)  // We don't know type of product
 				{
 					$code_country .= ",'".$societe_acheteuse->country_code."'";
-				}
-				else
-				{
+				} else {
 					$prodstatic = new Product($this->db);
 					$prodstatic->fetch($idprod);
 					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
@@ -5433,8 +5174,7 @@ class Form
 							$return .= ' selected';
 							$selectedfound = true;
 						}
-					}
-					elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
+					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
 			   		{
 			   			$return .= ' selected';
 			   			$selectedfound = true;
@@ -5445,9 +5185,7 @@ class Form
 				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))
 				{
 					$return .= $rate['labelpositiverates'];
-				}
-				else
-				{
+				} else {
 					$return .= vatrate($rate['label']);
 				}
 				//$return.=($rate['code']?' '.$rate['code']:'');
@@ -5457,9 +5195,7 @@ class Form
 			}
 
 			if (!$options_only) $return .= '</select>';
-		}
-		else
-		{
+		} else {
 			$return .= $this->error;
 		}
 
@@ -5560,8 +5296,7 @@ class Form
 			$sday	= (!empty($reg[3]) ? $reg[3] : '');
 			$shour	= (!empty($reg[4]) ? $reg[4] : '');
 			$smin	= (!empty($reg[5]) ? $reg[5] : '');
-		}
-		elseif (strval($set_time) != '' && $set_time != -1)
+		} elseif (strval($set_time) != '' && $set_time != -1)
 		{
 			// set_time est un timestamps (0 possible)
 			$syear = dol_print_date($set_time, "%Y");
@@ -5572,16 +5307,12 @@ class Form
 				$shour = dol_print_date($set_time, "%H");
 				$smin = dol_print_date($set_time, "%M");
 				$ssec = dol_print_date($set_time, "%S");
-			}
-			else
-			{
+			} else {
 				$shour = '';
 				$smin = '';
 				$ssec = '';
 			}
-		}
-		else
-		{
+		} else {
 			// Date est '' ou vaut -1
 			$syear = '';
 			$smonth = '';
@@ -5628,14 +5359,12 @@ class Form
 						$base = DOL_URL_ROOT.'/core/';
 						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
 						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
-					}
-					else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					} else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				elseif ($usecalendar == 'jquery')
+				} elseif ($usecalendar == 'jquery')
 				{
 					if (!$disabled)
 					{
@@ -5688,9 +5417,7 @@ class Form
                 		$retstring.='    });';
                 		$retstring.='});';
                 		$retstring.="</script>";*/
-					}
-					else
-					{
+					} else {
 						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 					}
 
@@ -5698,15 +5425,12 @@ class Form
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				else
-				{
+				} else {
 					$retstring .= "Bad value of MAIN_POPUP_CALENDAR";
 				}
 			}
 			// Show date with combo selects
-			else
-			{
+			else {
 				//$retstring.='<div class="inline-block">';
 				// Day
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
@@ -5742,9 +5466,7 @@ class Form
 				if ($emptydate || $set_time == -1)
 				{
 					$retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
-				}
-				else
-				{
+				} else {
 					$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
 					for ($year = $syear - 10; $year < $syear + 10; $year++)
@@ -5819,8 +5541,7 @@ class Form
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
-            }
-            elseif ($addnowlink == 2)
+            } elseif ($addnowlink == 2)
             {
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
@@ -5846,8 +5567,7 @@ class Form
                 if ($addnowlink == 1)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
+                } elseif ($addnowlink == 2)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
                 }
@@ -5862,8 +5582,7 @@ class Form
                 if ($addnowlink == 1)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
+                } elseif ($addnowlink == 2)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
                 }
@@ -5968,12 +5687,10 @@ class Form
 				$retstring .= ">".$hour."</option>";
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text' || $typehour == 'textselect')
+		} elseif ($typehour == 'text' || $typehour == 'textselect')
 		{
 			$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';
-		}
-		else return 'BadValueForParameterTypeHour';
+		} else return 'BadValueForParameterTypeHour';
 
 		if ($typehour != 'text') $retstring .= ' '.$langs->trans('HourShort');
 		else $retstring .= '<span class="hideonsmartphone">:</span>';
@@ -5992,8 +5709,7 @@ class Form
 				$retstring .= '>'.$min.'</option>';
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text')
+		} elseif ($typehour == 'text')
 		{
 			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
 		}
@@ -6088,9 +5804,7 @@ class Form
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
 			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
-		{
+		} else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
 			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled);
 		}
@@ -6118,9 +5832,7 @@ class Form
 		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 		{
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
-		}
-		else
-		{
+		} else {
 			$tmpescaped = $db->escape($tmpescaped);
 		}
 		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
@@ -6162,9 +5874,7 @@ class Form
 				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
-		}
-        else
-        {
+		} else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
         }
@@ -6173,9 +5883,7 @@ class Form
 		{
 			if (isset($objecttmp->fields['ref'])) {
 				$fieldstoshow = 't.ref';
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorNoFieldWithAttributeShowoncombobox");
 				return $langs->trans('ErrorNoFieldWithAttributeShowoncombobox');
@@ -6263,14 +5971,10 @@ class Form
 						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else
-					{
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -6280,9 +5984,7 @@ class Form
 			}
 
 			$out .= '</select>'."\n";
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -6388,9 +6090,7 @@ class Form
 				{
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
 					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
-				}
-				else
-				{
+				} else {
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
 					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
 					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';
@@ -6518,9 +6218,7 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else
-		{
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6636,9 +6334,7 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else
-		{
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6676,18 +6372,16 @@ class Form
 		// Add code for jquery to use multiselect
 		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
 		{
+			$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+						<script>'."\n";
 			if ($addjscombo == 1)
 			{
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->'."\n";
-				$out .= '<script>'."\n";
 				$out .= 'function formatResult(record) {'."\n";
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6695,9 +6389,7 @@ class Form
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6712,14 +6404,11 @@ class Form
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			}
-			elseif ($addjscombo == 2)
+			} elseif ($addjscombo == 2)
 			{
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
-				$out .= "\n".'<!-- JS CODE TO ENABLE external lib for id '.$htmlname.' -->'."\n";
-				$out .= '<script>'."\n";
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').multiSelect({
 								containerHTML: \'<div class="multi-select-container">\',
@@ -6970,41 +6659,31 @@ class Form
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/'.$element;
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'facturerec') {
+				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'propal') {
+				} elseif ($objecttype == 'propal') {
 					$tplpath = 'comm/'.$element;
 					if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'supplier_proposal') {
+				} elseif ($objecttype == 'supplier_proposal') {
 					if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
+				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
 					$tplpath = 'expedition';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-        		elseif ($objecttype == 'reception') {
+				} elseif ($objecttype == 'reception') {
         			$tplpath = 'reception';
         			if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
-        		}
-				elseif ($objecttype == 'delivery') {
+        		} elseif ($objecttype == 'delivery') {
 					$tplpath = 'livraison';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'invoice_supplier') {
+				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
-				}
-				elseif ($objecttype == 'order_supplier') {
+				} elseif ($objecttype == 'order_supplier') {
 					$tplpath = 'fourn/commande';
-				}
-				elseif ($objecttype == 'expensereport') {
+				} elseif ($objecttype == 'expensereport') {
 					$tplpath = 'expensereport';
-				}
-				elseif ($objecttype == 'subscription') {
+				} elseif ($objecttype == 'subscription') {
 					$tplpath = 'adherents';
 				}
 
@@ -7112,8 +6791,7 @@ class Form
 			{
 				$possiblelinks = array_merge($possiblelinks, $hookmanager->resArray);
 			}
-		}
-		elseif ($reshook > 0)
+		} elseif ($reshook > 0)
 		{
 			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
 			{
@@ -7200,9 +6878,7 @@ class Form
     		</div>
     		</dd>
     		</dl>';
-		}
-		else
-		{
+		} else {
 			$linktoelem = '';
 		}
 
@@ -7252,9 +6928,7 @@ class Form
 		{
 			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
-		}
-		else
-	    {
+		} else {
 	   		$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
 			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
@@ -7297,9 +6971,7 @@ class Form
 				if ($selected == $obj->rowid)
 				{
 					print '<option value="'.$obj->rowid.'" selected>';
-				}
-				else
-				{
+				} else {
 					print '<option value="'.$obj->rowid.'">';
 				}
 				print $obj->label;
@@ -7307,8 +6979,7 @@ class Form
 				$i++;
 			}
 			print "</select>";
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -7369,13 +7040,10 @@ class Form
 			if ($conf->browser->name == 'chrome')
 			{
 				$stringforfirstkey .= ' ALT +';
-			}
-			elseif ($conf->browser->name == 'firefox')
+			} elseif ($conf->browser->name == 'firefox')
 			{
 				$stringforfirstkey .= ' ALT + SHIFT +';
-			}
-			else
-			{
+			} else {
 				$stringforfirstkey .= ' CTL +';
 			}
 
@@ -7462,8 +7130,7 @@ class Form
 					$ret .= $this->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
 				}
 			}
-		}
-		elseif ($object->element == 'member')
+		} elseif ($object->element == 'member')
 		{
 			$ret .= $object->ref.'<br>';
 			$fullname = $object->getFullName($langs);
@@ -7472,24 +7139,19 @@ class Form
 			} else {
 				$ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
 			}
-		}
-		elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
+		} elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
 		{
 			$ret .= dol_htmlentities($object->getFullName($langs));
-		}
-		elseif (in_array($object->element, array('action', 'agenda')))
+		} elseif (in_array($object->element, array('action', 'agenda')))
 		{
 			$ret .= $object->ref.'<br>'.$object->label;
-		}
-		elseif (in_array($object->element, array('adherent_type')))
+		} elseif (in_array($object->element, array('adherent_type')))
 		{
 			$ret .= $object->label;
-		}
-		elseif ($object->element == 'ecm_directories')
+		} elseif ($object->element == 'ecm_directories')
 		{
 			$ret .= '';
-		}
-		elseif ($fieldref != 'none')
+		} elseif ($fieldref != 'none')
 		{
 			$ret .= dol_htmlentities($object->$fieldref);
 		}
@@ -7576,8 +7238,7 @@ class Form
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
 			}
 			$email = $object->email;
-		}
-		elseif ($modulepart == 'contact')
+		} elseif ($modulepart == 'contact')
 		{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
@@ -7589,8 +7250,7 @@ class Form
 			}
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'userphoto')
+		} elseif ($modulepart == 'userphoto')
 		{
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
@@ -7603,8 +7263,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'memberphoto')
+		} elseif ($modulepart == 'memberphoto')
 		{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
@@ -7617,9 +7276,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		else
-		{
+		} else {
 			// Generic case to show photos
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo))
@@ -7647,8 +7304,7 @@ class Form
 				}
 				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			elseif ($altfile && file_exists($dir."/".$altfile))
+			} elseif ($altfile && file_exists($dir."/".$altfile))
 			{
 				if ($addlinktofullsize)
 				{
@@ -7658,16 +7314,13 @@ class Form
 				}
 				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			else
-			{
+			} else {
 				$nophoto = '/public/theme/common/nophoto.png';
 				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
 				{
 					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {
 						$nophoto = '/public/theme/common/company.png';
-					}
-					else {
+					} else {
 						$nophoto = '/public/theme/common/user_anonymous.png';
 						if ($object->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
 						if ($object->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
@@ -7684,9 +7337,7 @@ class Form
 					//$defaultimg=urlencode(dol_buildpath($nophoto,3));
 					$defaultimg = 'mm';
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash
-				}
-				else
-				{
+				} else {
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
 				}
 			}
@@ -7699,8 +7350,7 @@ class Form
 				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';
 				$ret .= '</table>';
 			}
-		}
-		else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		} else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
 
 		return $ret;
 	}
@@ -7748,9 +7398,7 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
 			if ($force_entity) $sql .= " WHERE ug.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE ug.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE ug.entity IN (0,".$conf->entity.")";
 		}
 		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
@@ -7796,16 +7444,12 @@ class Form
 					$out .= '</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -7972,9 +7616,7 @@ class Form
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -8008,9 +7650,7 @@ class Form
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -8051,9 +7691,7 @@ class Form
 				$out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -8149,9 +7787,7 @@ class Form
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -8170,13 +7806,11 @@ class Form
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -8188,15 +7822,11 @@ class Form
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -8219,9 +7849,7 @@ class Form
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -8268,8 +7896,7 @@ class Form
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';
-		        }
-		        else {
+		        } else {
 					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'">';
 		        }
 		    }
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
new file mode 100644
index 00000000000..5e673d97611
--- /dev/null
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -0,0 +1,297 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 12.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+
+
+-- Missing in v11
+
+UPDATE llx_c_units set scale = 3600 where code  = 'H' and unit_type = 'time';
+UPDATE llx_c_units set scale = 86400 where code = 'D' and unit_type = 'time';
+
+create table llx_commande_fournisseur_dispatch_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp,
+  fk_object        integer NOT NULL,    -- object id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;
+
+ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande_fournisseur_dispatch_extrafields (fk_object);
+
+UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version = 'SYSCOHADA';
+
+create table llx_c_shipment_package_type
+(
+    rowid        integer  AUTO_INCREMENT PRIMARY KEY,
+    label        varchar(50) NOT NULL,  -- Short name
+    description	 varchar(255), -- Description
+    active       integer DEFAULT 1 NOT NULL, -- Active or not	
+    entity       integer DEFAULT 1 NOT NULL -- Multi company id 
+)ENGINE=innodb;
+
+create table llx_facturedet_rec_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp,
+  fk_object        integer NOT NULL,    -- object id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;
+
+ALTER TABLE llx_facturedet_rec_extrafields ADD INDEX idx_facturedet_rec_extrafields (fk_object);
+
+ALTER TABLE llx_facture_rec MODIFY COLUMN titre varchar(200) NOT NULL;
+
+-- This var is per entity now, so we remove const if global if exists
+delete from llx_const where name = 'PROJECT_HIDE_TASKS' and entity = 0;
+
+
+-- For v12
+
+-- Delete an old index that is duplicated
+-- VMYSQL4.1 DROP INDEX ix_fk_product_stock on llx_product_batch;
+-- VPGSQL8.2 DROP INDEX ix_fk_product_stock
+
+ALTER TABLE llx_actioncomm DROP COLUMN punctual;
+
+DELETE FROM llx_menu where module='supplier_proposal';
+
+UPDATE llx_website SET lang = 'en' WHERE lang like 'en_%';
+UPDATE llx_website SET lang = 'fr' WHERE lang like 'fr_%';
+UPDATE llx_website SET lang = 'es' WHERE lang like 'es_%';
+UPDATE llx_website SET lang = 'de' WHERE lang like 'de_%';
+UPDATE llx_website SET lang = 'it' WHERE lang like 'it_%';
+UPDATE llx_website SET lang = 'pt' WHERE lang like 'pt_%';
+UPDATE llx_website_page SET lang = 'en' WHERE lang like 'en_%';
+UPDATE llx_website_page SET lang = 'fr' WHERE lang like 'fr_%';
+UPDATE llx_website_page SET lang = 'es' WHERE lang like 'es_%';
+UPDATE llx_website_page SET lang = 'de' WHERE lang like 'de_%';
+UPDATE llx_website_page SET lang = 'it' WHERE lang like 'it_%';
+UPDATE llx_website_page SET lang = 'pt' WHERE lang like 'pt_%';
+
+ALTER TABLE llx_website ADD COLUMN lang varchar(8);
+ALTER TABLE llx_website ADD COLUMN otherlang varchar(255); 
+
+ALTER TABLE llx_website_page ADD COLUMN author_alias varchar(64);
+
+UPDATE llx_rights_def SET perms = 'order_advance', subperms = 'close' WHERE module = 'commande' AND perms = 'cloturer';
+UPDATE llx_rights_def SET perms = 'propal_advance', subperms = 'close' WHERE module = 'propale' AND perms = 'cloturer';
+
+ALTER TABLE llx_holiday_users DROP INDEX uk_holiday_users;
+ALTER TABLE llx_holiday_users ADD UNIQUE INDEX uk_holiday_users(fk_user, fk_type);
+
+ALTER TABLE llx_ticket ADD COLUMN import_key varchar(14);
+
+ALTER TABLE llx_ticket ADD UNIQUE uk_ticket_ref (ref, entity);
+ALTER TABLE llx_ticket ADD INDEX idx_ticket_entity (entity);
+ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_soc (fk_soc);
+ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_user_assign (fk_user_assign);
+ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_project (fk_project);
+ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_statut (fk_statut);
+
+
+--ALTER TABLE llx_facturerec DROP COLUMN vat_src_code;
+
+
+-- Migration to the new regions (France)
+UPDATE llx_c_regions set nom = 'Centre-Val de Loire' WHERE fk_pays = 1 AND code_region = 24;
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (1, 27, '21231', 0, 'Bourgogne-Franche-Comté');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (1, 28, '76540', 0, 'Normandie');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (1, 32, '59350', 4, 'Hauts-de-France');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (1, 44, '67482', 2, 'Grand Est');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (1, 75, '33063', 0, 'Nouvelle-Aquitaine');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (1, 76, '31355', 1, 'Occitanie');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (1, 84, '69123', 1, 'Auvergne-Rhône-Alpes');
+
+UPDATE llx_c_departements set fk_region = 27 WHERE fk_region = 26 OR fk_region = 43;
+UPDATE llx_c_departements set fk_region = 28 WHERE fk_region = 25 OR fk_region = 23;
+UPDATE llx_c_departements set fk_region = 32 WHERE fk_region = 22 OR fk_region = 31;
+UPDATE llx_c_departements set fk_region = 44 WHERE fk_region = 21 OR fk_region = 41 OR fk_region = 42;
+UPDATE llx_c_departements set fk_region = 75 WHERE fk_region = 54 OR fk_region = 74 OR fk_region = 72;
+UPDATE llx_c_departements set fk_region = 76 WHERE fk_region = 73 OR fk_region = 91;
+UPDATE llx_c_departements set fk_region = 84 WHERE fk_region = 82 OR fk_region = 83;
+
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 21;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 22;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 23;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 25;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 26;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 31;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 41;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 42;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 43;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 54;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 72;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 73;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 74;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 82;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 83;
+DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 91;
+
+ALTER TABLE llx_bookmark DROP INDEX uk_bookmark_url;
+ALTER TABLE llx_bookmark DROP INDEX uk_bookmark_title;
+
+ALTER TABLE llx_bookmark MODIFY COLUMN url TEXT;
+
+ALTER TABLE llx_bookmark ADD UNIQUE uk_bookmark_title (fk_user, entity, title);
+
+
+ALTER TABLE llx_societe_rib ADD COLUMN stripe_account varchar(128);
+
+create table llx_object_lang
+(
+  rowid          integer AUTO_INCREMENT PRIMARY KEY,
+  fk_object      integer      DEFAULT 0 NOT NULL,
+  type_object    varchar(32)  NOT NULL,				-- value found into $object->element
+  property       varchar(32)  NOT NULL,
+  lang           varchar(5)   DEFAULT 0 NOT NULL,
+  value          text,
+  import_key varchar(14) DEFAULT NULL
+)ENGINE=innodb;
+
+
+ALTER TABLE llx_object_lang ADD UNIQUE INDEX uk_object_lang (fk_object, type_object, property, lang);
+
+
+CREATE TABLE llx_categorie_actioncomm
+(
+  fk_categorie integer NOT NULL,
+  fk_actioncomm integer NOT NULL,
+  import_key varchar(14)
+) ENGINE=innodb;
+
+ALTER TABLE llx_categorie_actioncomm ADD PRIMARY KEY pk_categorie_actioncomm (fk_categorie, fk_actioncomm);
+ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_actioncomm (fk_actioncomm);
+
+ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_fk_actioncomm FOREIGN KEY (fk_actioncomm) REFERENCES llx_actioncomm (id);
+
+
+ALTER TABLE llx_accounting_account ADD COLUMN labelshort varchar(255) DEFAULT NULL after label;
+
+ALTER TABLE llx_subscription ADD COLUMN fk_user_creat   integer DEFAULT NULL;
+ALTER TABLE llx_subscription ADD COLUMN fk_user_valid   integer DEFAULT NULL;
+
+UPDATE llx_c_forme_juridique set libelle = 'SRL - Société à responsabilité limitée' WHERE code = '201';
+
+ALTER TABLE llx_c_country ADD COLUMN eec integer;
+UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','DK','EE','ES','FI','FR','GB','GR','HR','NL','HU','IE','IM','IT','LT','LU','LV','MC','MT','PL','PT','RO','SE','SK','SI','UK');
+
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  1, 'PCG18-ASSOC', 'French foundation chart of accounts 2018', 1);
+
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  1, 'PCGAFR14-DEV', 'The developed farm accountancy french plan 2014', 1);
+
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 41, 'AT-BASE', 'Plan Austria', 1);
+
+
+
+create table llx_c_ticket_resolution
+(
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer DEFAULT 1,
+  code			varchar(32)				NOT NULL,
+  pos			varchar(32)				NOT NULL,
+  label			varchar(128)			NOT NULL,
+  active		integer DEFAULT 1,
+  use_default	integer DEFAULT 1,
+  description	varchar(255)
+)ENGINE=innodb;
+
+ALTER TABLE llx_c_ticket_resolution ADD UNIQUE INDEX uk_code (code, entity);
+
+INSERT INTO llx_c_ticket_resolution (code, pos, label, active, use_default, description) VALUES('SOLVED',   '10', 'Solved',    1, 0, NULL);
+INSERT INTO llx_c_ticket_resolution (code, pos, label, active, use_default, description) VALUES('CANCELED', '50', 'Canceled',  1, 0, NULL);
+INSERT INTO llx_c_ticket_resolution (code, pos, label, active, use_default, description) VALUES('OTHER',    '90', 'Other',     1, 0, NULL);
+
+DELETE FROM llx_const WHERE name = __ENCRYPT('DONATION_ART885')__;
+
+ALTER TABLE llx_extrafields MODIFY COLUMN printable integer DEFAULT 0;
+ALTER TABLE llx_extrafields ADD COLUMN printable integer DEFAULT 0;
+
+UPDATE llx_const SET name = 'INVOICE_USE_RETAINED_WARRANTY' WHERE name = 'INVOICE_USE_SITUATION_RETAINED_WARRANTY';
+
+ALTER TABLE llx_accounting_account DROP COLUMN pcg_subtype;
+
+ALTER TABLE llx_product ADD COLUMN accountancy_code_buy_intra varchar(32) AFTER accountancy_code_buy;
+ALTER TABLE llx_product ADD COLUMN accountancy_code_buy_export varchar(32) AFTER accountancy_code_buy_intra;
+
+ALTER TABLE llx_entrepot ADD COLUMN fax varchar(20) DEFAULT NULL;
+ALTER TABLE llx_entrepot ADD COLUMN phone varchar(20) DEFAULT NULL;
+
+ALTER TABLE llx_accounting_account ADD COLUMN reconcilable tinyint DEFAULT 0 NOT NULL after active;
+
+ALTER TABLE llx_categorie MODIFY type integer NOT NULL DEFAULT 1;
+
+ALTER TABLE llx_societe_remise_except ADD COLUMN vat_src_code varchar(10) DEFAULT '';
+
+ALTER TABLE llx_blockedlog MODIFY COLUMN object_data mediumtext;
+ALTER TABLE llx_blockedlog ADD COLUMN object_version varchar(32) DEFAULT '';
+
+ALTER TABLE llx_product_lot MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_product_batch MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_expeditiondet_batch MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_commande_fournisseur_dispatch MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_stock_mouvement MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_mrp_production MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_mrp_production MODIFY qty real NOT NULL DEFAULT 1;
+
+create table llx_categorie_website_page
+(
+  fk_categorie  	integer NOT NULL,
+  fk_website_page   integer NOT NULL,
+  import_key    	varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_categorie_website_page ADD PRIMARY KEY pk_categorie_website_page (fk_categorie, fk_website_page);
+ALTER TABLE llx_categorie_website_page ADD INDEX idx_categorie_website_page_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_website_page ADD INDEX idx_categorie_website_page_fk_website_page (fk_website_page);
+
+ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_website_page_rowid FOREIGN KEY (fk_website_page) REFERENCES llx_website_page (rowid);
+
+ALTER TABLE llx_categorie ADD COLUMN date_creation	datetime; 
+ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp;
+ALTER TABLE llx_categorie ADD COLUMN fk_user_creat	integer;
+ALTER TABLE llx_categorie ADD COLUMN fk_user_modif	integer;
+
+ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commandefourndet FOREIGN KEY (fk_commandefourndet) REFERENCES llx_commande_fournisseurdet (rowid);
+
+
+-- VMYSQL4.3 ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN fk_facture INTEGER NULL;
+-- VPGSQL8.2 ALTER TABLE llx_prelevement_facture_demande ALTER COLUMN fk_facture DROP NOT NULL;
+ALTER TABLE llx_prelevement_facture_demande ADD COLUMN fk_facture_fourn INTEGER NULL;
+
+-- VMYSQL4.3 ALTER TABLE llx_prelevement_facture MODIFY COLUMN fk_facture INTEGER NULL;
+-- VPGSQL8.2 ALTER TABLE llx_prelevement_facture ALTER COLUMN fk_facture DROP NOT NULL;
+ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
+
+ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
+
+UPDATE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
+
+ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN hostcharset varchar(16) DEFAULT 'UTF-8';