diff --git a/ChangeLog b/ChangeLog
index c8b7db19236..ede0e10a89f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ Following changes may create regressions for some external modules, but were nec
 * Removed function dol_micro_time. Use native PHP microtime instead.
 * The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
 * The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS.
+* If your logo was visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible agin in menu. 
 
 
 ***** ChangeLog for 10.0.2 compared to 10.0.1 *****
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 3c04548d7c6..7d48790348d 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -279,8 +279,8 @@ if ($action != 'export_csv')
 				print '</tr>';
 			}
 
-			// Affiche le compte comptable en debut de ligne
-			print "<tr>";
+			// Show first line of a break
+			print '<tr class="trforbreak">';
 			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">' . $line->numero_compte . ($root_account_description ? ' - ' . $root_account_description : '') . '</td>';
 			print '</tr>';
 
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index dac238f97d6..f90d5797d09 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -926,91 +926,131 @@ class AccountancyExport
      *
      * @return void
      */
-    public function exportLDCompta($objectLines)
-    {
+	public function exportLDCompta($objectLines)
+	{
 
-        $separator = ';';
-        $end_line = "\n";
+		$separator = ';';
+		$end_line = "\r\n";
 
-        foreach ($objectLines as $line) {
+		foreach ($objectLines as $line) {
 
-            $date_document = dol_print_date($line->doc_date, '%Y%m%d');
-            $date_creation = dol_print_date($line->date_creation,  '%Y%m%d');
+			$date_document = dol_print_date($line->doc_date, '%Y%m%d');
+			$date_creation = dol_print_date($line->date_creation,  '%Y%m%d');
 
-            // TYPE
-            $type_enregistrement = 'E'; // For write movement
-            print $type_enregistrement . $separator;
-            // JNAL
-            print substr($line->code_journal, 0, 2) . $separator;
-            // NECR
-            print $line->id . $separator;
-            // NPIE
-            print $line->piece_num . $separator;
-            // DATP
-            print $date_document . $separator;
-            // LIBE
-            print $line->label_operation . $separator;
-            // DATH
-            print $line->date_lim_reglement . $separator;
-            // CNPI
-            if ($line->doc_type == 'supplier_invoice') {
-                if ($line->montant < 0) {
-                    $nature_piece = 'AF';
-                } else {
-                    $nature_piece = 'FF';
-                }
-            } elseif ($line->doc_type == 'customer_invoice') {
-                if ($line->montant < 0) {
-                    $nature_piece = 'AC';
-                } else {
-                    $nature_piece = 'FC';
-                }
-            } else {
-                $nature_piece = '';
-            }
-            print $nature_piece . $separator;
-            // RACI
-            /*
-            if (! empty($line->subledger_account)) {
-                if ($line->doc_type == 'supplier_invoice') {
-                    $racine_subledger_account = '40';
-                } elseif ($line->doc_type == 'customer_invoice') {
-                    $racine_subledger_account = '41';
-                } else {
-                    $nature_piece = '';
-                }
-                print $racine_subledger_account . $separator;
-            } else {
-                print $separator;
-            }
-            */
-            // MONT
-            print price(abs($line->montant)) . $separator;
-            // CODC
-            print $line->sens . $separator;
-            // CPTG
-            print length_accountg($line->numero_compte) . $separator;
-            // DATE
-            print $date_creation . $separator;
-            // CLET
-            print $line->lettering_code . $separator;
-            // DATL
-            print $line->date_lettering . $separator;
-            // CPTA
-            if (! empty($line->subledger_account)) {
-                print length_accounta($line->subledger_account) . $separator;
-            }
-            // CNAT
-            if ($line->doc_type == 'supplier_invoice' && ! empty($line->subledger_account)) {
-                print 'F';
-            } elseif ($line->doc_type == 'customer_invoice' && ! empty($line->subledger_account)) {
-                print 'C';
-            } else {
-                print '';
-            }
-            print $end_line;
-        }
-    }
+			// TYPE
+			$type_enregistrement = 'E'; // For write movement
+			print $type_enregistrement . $separator;
+			// JNAL
+			print substr($line->code_journal, 0, 2) . $separator;
+			// NECR
+			print $line->id . $separator;
+			// NPIE
+			print $line->piece_num . $separator;
+			// DATP
+			print $date_document . $separator;
+			// LIBE
+			print $line->label_operation . $separator;
+			// DATH
+			print $line->date_lim_reglement . $separator;
+			// CNPI
+			if ($line->doc_type == 'supplier_invoice') {
+				if ($line->montant < 0) {
+					$nature_piece = 'AF';
+				} else {
+					$nature_piece = 'FF';
+				}
+			} elseif ($line->doc_type == 'customer_invoice') {
+				if ($line->montant < 0) {
+					$nature_piece = 'AC';
+				} else {
+					$nature_piece = 'FC';
+				}
+			} else {
+				$nature_piece = '';
+			}
+			print $nature_piece . $separator;
+			// RACI
+			/*
+			if (! empty($line->subledger_account)) {
+				if ($line->doc_type == 'supplier_invoice') {
+					$racine_subledger_account = '40';
+				} elseif ($line->doc_type == 'customer_invoice') {
+					$racine_subledger_account = '41';
+				} else {
+					$nature_piece = '';
+				}
+				print $racine_subledger_account . $separator;
+			} else {
+				print $separator;
+			}
+			*/
+			print $separator; // deprecated CPTG & CPTA use instead
+			// MONT
+			print price(abs($line->montant), 0, '', 1, 2) . $separator;
+			// CODC
+			print $line->sens . $separator;
+			// CPTG
+			print length_accountg($line->numero_compte) . $separator;
+			// DATE
+			print $date_creation . $separator;
+			// CLET
+			print $line->lettering_code . $separator;
+			// DATL
+			print $line->date_lettering . $separator;
+			// CPTA
+			if (! empty($line->subledger_account)) {
+				print length_accounta($line->subledger_account) . $separator;
+			} else {
+				print $separator;
+			}
+			// CNAT
+			if ($line->doc_type == 'supplier_invoice' && ! empty($line->subledger_account)) {
+				print 'F' . $separator;
+			} elseif ($line->doc_type == 'customer_invoice' && ! empty($line->subledger_account)) {
+				print 'C' . $separator;
+			} else {
+				print $separator;
+			}
+			// SECT
+			print $separator;
+			// CTRE
+			print $separator;
+			// NORL
+			print $separator;
+			// DATV
+			print $separator;
+			// REFD
+			print $line->doc_ref . $separator;
+			// CODH
+			print $separator;
+			// NSEQ
+			print $separator;
+			// MTDV
+			print '0' . $separator;
+			// CODV
+			print $separator;
+			// TXDV
+			print '0' . $separator;
+			// MOPM
+			print $separator;
+			// BONP
+			print $separator;
+			// BQAF
+			print $separator;
+			// ECES
+			print $separator;
+			// TXTL
+			print $separator;
+			// ECRM
+			print $separator;
+			// DATK
+			print $separator;
+			// HEUK
+			print $separator;
+
+			print $end_line;
+		}
+	}
 
 	/**
 	 * Export format : Charlemagne
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 97f1c771122..a815e5b858b 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -192,12 +192,12 @@ if ($search_lineid) {
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.ref", $search_invoice);
 }
+if (strlen(trim($search_label))) {
+	$sql .= natural_search("f.libelle", $search_label);
+}
 if (strlen(trim($search_ref))) {
 	$sql .= natural_search("p.ref", $search_ref);
 }
-if (strlen(trim($search_label))) {
-	$sql .= natural_search("p.label", $search_label);
-}
 if (strlen(trim($search_desc))) {
 	$sql .= natural_search("l.description", $search_desc);
 }
@@ -300,14 +300,13 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre center nowraponall">';
    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
    	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
-	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 6ba3e244582..fc453a94250 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -234,12 +234,12 @@ if ($search_lineid) {
 if (strlen(trim($search_invoice))) {
     $sql .= natural_search("f.ref", $search_invoice);
 }
+if (strlen(trim($search_label))) {
+	$sql .= natural_search("f.libelle", $search_label);
+}
 if (strlen(trim($search_ref))) {
     $sql .= natural_search("p.ref", $search_ref);
 }
-if (strlen(trim($search_label))) {
-    $sql .= natural_search("p.label", $search_label);
-}
 if (strlen(trim($search_desc))) {
     $sql .= natural_search("l.description", $search_desc);
 }
@@ -317,6 +317,7 @@ if ($result) {
 	if ($search_year)        $param.='&search_year='.urlencode($search_year);
 	if ($search_invoice)     $param.='&search_invoice='.urlencode($search_invoice);
 	if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
+	if ($search_label)       $param.='&search_label='.urlencode($search_label);
 	if ($search_desc)        $param.='&search_desc='.urlencode($search_desc);
 	if ($search_amount)      $param.='&search_amount='.urlencode($search_amount);
 	if ($search_vat)         $param.='&search_vat='.urlencode($search_vat);
@@ -362,14 +363,13 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre center nowraponall">';
    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
    	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
-	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index cba3fd822cc..e48f122c4b0 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -93,158 +93,87 @@ $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst")
 print '<span class="opacitymedium">'.$langs->trans("AccountantDesc")."</span><br>\n";
 print "<br>\n";
 
-if ($action == 'edit' || $action == 'updateedit')
-{
-	/**
-	 * Edit parameters
-	 */
-	print "\n".'<script type="text/javascript" language="javascript">';
-	print '$(document).ready(function () {
-			  $("#selectcountry_id").change(function() {
-				document.form_index.action.value="updateedit";
-				document.form_index.submit();
-			  });
-		  });';
-	print '</script>'."\n";
+/**
+ * Edit parameters
+ */
+print "\n".'<script type="text/javascript" language="javascript">';
+print '$(document).ready(function () {
+		  $("#selectcountry_id").change(function() {
+			document.form_index.action.value="updateedit";
+			document.form_index.submit();
+		  });
+	  });';
+print '</script>'."\n";
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
 
-	print '<table class="noborder" width="100%">';
-	print '<tr class="oddeven liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
+print '<table class="noborder" width="100%">';
+print '<tr class="oddeven liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
-	// Name
-	print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-	print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_NAME?$conf->global->MAIN_INFO_ACCOUNTANT_NAME: GETPOST("nom", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
+// Name
+print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
+print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_NAME?$conf->global->MAIN_INFO_ACCOUNTANT_NAME: GETPOST("nom", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
 
-	// Address
-	print '<tr><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
-	print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS?$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS: GETPOST("address", 'nohtml')) . '</textarea></td></tr>'."\n";
+// Address
+print '<tr><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
+print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS?$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS: GETPOST("address", 'nohtml')) . '</textarea></td></tr>'."\n";
 
-	print '<tr><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
-	print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_ZIP?$conf->global->MAIN_INFO_ACCOUNTANT_ZIP: GETPOST("zipcode", 'alpha')) . '"></td></tr>'."\n";
+print '<tr><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
+print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_ZIP?$conf->global->MAIN_INFO_ACCOUNTANT_ZIP: GETPOST("zipcode", 'alpha')) . '"></td></tr>'."\n";
 
-	print '<tr><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
-	print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_TOWN?$conf->global->MAIN_INFO_ACCOUNTANT_TOWN: GETPOST("town", 'nohtml')) . '"></td></tr>'."\n";
+print '<tr><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
+print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_TOWN?$conf->global->MAIN_INFO_ACCOUNTANT_TOWN: GETPOST("town", 'nohtml')) . '"></td></tr>'."\n";
 
-	// Country
-	print '<tr><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
-	//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
-	print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-	print '</td></tr>'."\n";
+// Country
+print '<tr><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
+//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
+print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
+if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+print '</td></tr>'."\n";
 
-	print '<tr><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-	$formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id');
-	print '</td></tr>'."\n";
+print '<tr><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
+$formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id');
+print '</td></tr>'."\n";
 
-	print '<tr><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
-	print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_PHONE . '"></td></tr>';
-	print '</td></tr>'."\n";
+print '<tr><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_PHONE . '"></td></tr>';
+print '</td></tr>'."\n";
 
-	print '<tr><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
-	print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_FAX . '"></td></tr>';
-	print '</td></tr>'."\n";
+print '<tr><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_FAX . '"></td></tr>';
+print '</td></tr>'."\n";
 
-	print '<tr><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
-	print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_MAIL . '"></td></tr>';
-	print '</td></tr>'."\n";
+print '<tr><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_MAIL . '"></td></tr>';
+print '</td></tr>'."\n";
 
-	// Web
-	print '<tr><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
-	print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_WEB . '"></td></tr>';
-	print '</td></tr>'."\n";
+// Web
+print '<tr><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_WEB . '"></td></tr>';
+print '</td></tr>'."\n";
 
-	// Code
-	print '<tr><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
-	print '<input name="code" id="code" class="minwidth100" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_CODE?$conf->global->MAIN_INFO_ACCOUNTANT_CODE: GETPOST("code", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
+// Code
+print '<tr><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
+print '<input name="code" id="code" class="minwidth100" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_CODE?$conf->global->MAIN_INFO_ACCOUNTANT_CODE: GETPOST("code", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
 
-	// Note
-	print '<tr><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-	print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
-	print '</td></tr>';
+// Note
+print '<tr><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
+print '</td></tr>';
 
-	print '</table>';
+print '</table>';
 
-	print '<br><div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-	print '<br>';
+print '<br><div class="center">';
+print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+//print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+//print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '</div>';
+//print '<br>';
 
-	print '</form>';
-}
-else
-{
-	/*
-	 * Show parameters
-	 */
+print '</form>';
 
-	// Actions buttons
-	//print '<div class="tabsAction">';
-	//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-	//print '</div><br>';
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="oddeven liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-
-	print '<tr><td class="titlefield wordbreak">'.$langs->trans("CompanyName").'</td><td>';
-	print $conf->global->MAIN_INFO_ACCOUNTANT_NAME;
-	print '</td></tr>';
-
-
-	print '<tr><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . '</td></tr>';
-
-
-	print '<tr><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . '</td></tr>';
-
-
-	print '<tr><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . '</td></tr>';
-
-
-	print '<tr><td>'.$langs->trans("CompanyCountry").'</td><td>';
-	if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY))
-	{
-		$code = getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 2);
-		$img=picto_from_langcode($code);
-		print $img?$img.' ':'';
-		print getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 1);
-	}
-	print '</td></tr>';
-
-
-	if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr><td>'.$langs->trans("Region-State").'</td><td>';
-	else print '<tr><td>'.$langs->trans("State").'</td><td>';
-	if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE)) print getState($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
-	else print '&nbsp;';
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code) . '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code) . '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80) . '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80) . '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("AccountantFileNumber").'</td><td>' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . '</td></tr>';
-
-	print '<tr><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '</td></tr>';
-
-	print '</table>';
-	print "</div>";
-
-	print '</form>';
-
-	// Actions buttons
-	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a></div>';
-	print '</div>';
-}
 
 llxFooter();
 
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 58c07b5ca3e..ca90c836929 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -222,7 +222,7 @@ llxHeader('', $langs->trans("Boxes"));
 
 print load_fiche_titre($langs->trans("Boxes"), '', 'title_setup');
 
-print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."</span><br>\n";
 
 /*
  * Search for the default active boxes for each possible position
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index a3534d3bc5a..dde962fe9bc 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -105,69 +105,79 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE", GETPOST("note", 'none'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD", GETPOST("barcode", 'alpha'), 'chaine', 0, '', $conf->entity);
 
-	$varforimage='logo'; $dirforimage=$conf->mycompany->dir_output.'/logos/';
-	if ($_FILES[$varforimage]["tmp_name"])
+	$dirforimage=$conf->mycompany->dir_output.'/logos/';
+
+	$arrayofimages = array('logo', 'logo_squarred');
+
+	foreach($arrayofimages as $varforimage)
 	{
-		if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg))
+		if ($_FILES[$varforimage]["tmp_name"])
 		{
-			$original_file=$reg[1];
-
-			$isimage=image_format_supported($original_file);
-			if ($isimage >= 0)
+			$reg = array();
+			if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg))
 			{
-				dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file);
-				if (! is_dir($dirforimage))
-				{
-					dol_mkdir($dirforimage);
-				}
-				$result=dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage.$original_file, 1, 0, $_FILES[$varforimage]['error']);
-				if ($result > 0)
-				{
-					dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO", $original_file, 'chaine', 0, '', $conf->entity);
+				$original_file=$reg[1];
 
-					// Create thumbs of logo (Note that PDF use original file and not thumbs)
-					if ($isimage > 0)
+				$isimage=image_format_supported($original_file);
+				if ($isimage >= 0)
+				{
+					dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file);
+					if (! is_dir($dirforimage))
 					{
-					    // Create thumbs
-					    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
-
-						// Create small thumb, Used on logon for example
-						$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-						if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg))
-						{
-							$imgThumbSmall = $reg[1];    // Save only basename
-							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-						}
-						else dol_syslog($imgThumbSmall);
-
-						// Create mini thumb, Used on menu or for setup page for example
-						$imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
-						if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbMini, $reg))
-						{
-							$imgThumbMini = $reg[1];     // Save only basename
-							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-						}
-						else dol_syslog($imgThumbMini);
+						dol_mkdir($dirforimage);
+					}
+					$result=dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage.$original_file, 1, 0, $_FILES[$varforimage]['error']);
+					if ($result > 0)
+					{
+						$constant = "MAIN_INFO_SOCIETE_LOGO";
+						if ($varforimage == 'logo_squarred') $constant = "MAIN_INFO_SOCIETE_LOGO_SQUARRED";
+
+						dolibarr_set_const($db, $constant, $original_file, 'chaine', 0, '', $conf->entity);
+
+						// Create thumbs of logo (Note that PDF use original file and not thumbs)
+						if ($isimage > 0)
+						{
+						    // Create thumbs
+						    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
+
+							// Create small thumb, Used on logon for example
+							$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+							if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg))
+							{
+								$imgThumbSmall = $reg[1];    // Save only basename
+								dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
+							}
+							else dol_syslog($imgThumbSmall);
+
+							// Create mini thumb, Used on menu or for setup page for example
+							$imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
+							if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbMini, $reg))
+							{
+								$imgThumbMini = $reg[1];     // Save only basename
+								dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
+							}
+							else dol_syslog($imgThumbMini);
+						}
+						else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
+					} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
+						$error++;
+						$langs->load("errors");
+						$tmparray=explode(':', $result);
+						setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
+					}
+					else
+					{
+						$error++;
+						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					}
-					else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
-				} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
-					$error++;
-					$langs->load("errors");
-					$tmparray=explode(':', $result);
-					setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
 				}
 				else
 				{
 					$error++;
-					setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 				}
 			}
-			else
-			{
-				$error++;
-				$langs->load("errors");
-				setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
-			}
 		}
 	}
 
@@ -247,7 +257,7 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 	}
 }
 
-if ($action == 'addthumb')  // Regenerate thumbs
+if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumbs
 {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$_GET["file"]))
 	{
@@ -256,15 +266,20 @@ if ($action == 'addthumb')  // Regenerate thumbs
 		// Create thumbs of logo
 		if ($isimage > 0)
 		{
+			$constant = "MAIN_INFO_SOCIETE_LOGO";
+			if ($action == 'addthumbsquarred') $constant = "MAIN_INFO_SOCIETE_LOGO_SQUARRED";
+
+			$reg = array();
+
 		    // Create thumbs
-		    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
+			//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
 
 			// Create small thumb. Used on logon for example
 			$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small', $quality);
 			if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg))
 			{
 				$imgThumbSmall = $reg[1];   // Save only basename
-				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
+				dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
 			}
 			else dol_syslog($imgThumbSmall);
 
@@ -273,7 +288,7 @@ if ($action == 'addthumb')  // Regenerate thumbs
 			if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbMini, $reg))
 			{
 				$imgThumbMini = $reg[1];   // Save only basename
-				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
+				dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
 			}
 			else dol_syslog($imgThumbMini);
 
@@ -297,24 +312,55 @@ if ($action == 'addthumb')  // Regenerate thumbs
 	}
 }
 
-if ($action == 'removelogo')
+
+if ($action == 'removelogo' || $action == 'removelogosquarred')
 {
+	$constant = "MAIN_INFO_SOCIETE_LOGO";
+	if ($action == 'removelogosquarred') $constant = "MAIN_INFO_SOCIETE_LOGO_SQUARRED";
+
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-	if ($mysoc->logo != '') dol_delete_file($logofile);
-	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO", $conf->entity);
-	$mysoc->logo='';
+	$logofilename = $mysoc->logo;
+	$logofilenamebis = $mysoc->logo_squarred;
+	if ($action == 'removelogosquarred')
+	{
+		$logofilename = $mysoc->logo_squarred;
+		$logofilenamebis = $mysoc->logo;
+	}
 
-	$logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-	if ($mysoc->logo_small != '') dol_delete_file($logosmallfile);
-	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $conf->entity);
-	$mysoc->logo_small='';
+	$logofile=$conf->mycompany->dir_output.'/logos/'.$logofilename;
+	if ($logofilename != '' && $logofilename != $logofilenamebis) dol_delete_file($logofile);
+	dolibarr_del_const($db, $constant, $conf->entity);
+	if ($action == 'removelogosquarred') $mysoc->logo_squarred='';
+	else $mysoc->logo='';
 
-	$logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini;
-	if ($mysoc->logo_mini != '') dol_delete_file($logominifile);
-	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $conf->entity);
-	$mysoc->logo_mini='';
+	$logofilename = $mysoc->logo_small;
+	$logofilenamebis = $mysoc->logo_squarred_small;
+	if ($action == 'removelogosquarred')
+	{
+		$logofilename = $mysoc->logo_squarred_small;
+		$logofilenamebis = $mysoc->logo_small;
+	}
+
+	$logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$logofilename;
+	if ($logofilename != '' && $logofilename != $logofilenamebis) dol_delete_file($logosmallfile);
+	dolibarr_del_const($db, $constant."_SMALL", $conf->entity);
+	if ($action == 'removelogosquarred') $mysoc->logo_squarred_small='';
+	else $mysoc->logo_small='';
+
+	$logofilename = $mysoc->logo_mini;
+	$logofilenamebis = $mysoc->logo_squarred_mini;
+	if ($action == 'removelogosquarred')
+	{
+		$logofilename = $mysoc->logo_squarred_mini;
+		$logofilenamebis = $mysoc->logo_mini;
+	}
+
+	$logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$logofilename;
+	if ($logofilename != '' && $logofilename != $logofilenamebis) dol_delete_file($logominifile);
+	dolibarr_del_const($db, $constant."_MINI", $conf->entity);
+	if ($action == 'removelogosquarred') $mysoc->logo_squarred_mini='';
+	else $mysoc->logo_mini='';
 }
 
 
@@ -337,875 +383,423 @@ $head = company_admin_prepare_head();
 
 dol_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
 
-print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Modify"), $langs->transnoentities("Save"))."</span><br>\n";
+print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."</span><br>\n";
 print "<br>\n";
 
-if ($action == 'edit' || $action == 'updateedit')
+
+/**
+ * Edit parameters
+ */
+print "\n".'<script type="text/javascript" language="javascript">';
+print '$(document).ready(function () {
+		  $("#selectcountry_id").change(function() {
+			document.form_index.action.value="updateedit";
+			document.form_index.submit();
+		  });
+	  });';
+print '</script>'."\n";
+
+print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
+
+// Name
+
+print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
+print '<input name="nom" id="name" class="minwidth200" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM: GETPOST("nom", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
+
+// Addresse
+
+print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
+print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')) . '</textarea></td></tr>'."\n";
+
+
+print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
+print '<input class="minwidth100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')) . '"></td></tr>'."\n";
+
+
+print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SOCIETE_TOWN" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')) . '"></td></tr>'."\n";
+
+// Country
+
+print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
+//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
+print $form->select_country($mysoc->country_id, 'country_id');
+if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+print '</td></tr>'."\n";
+
+
+print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
+$state_id=0;
+if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
 {
-	/**
-	 * Edition des parametres
-	 */
-	print "\n".'<script type="text/javascript" language="javascript">';
-	print '$(document).ready(function () {
-			  $("#selectcountry_id").change(function() {
-				document.form_index.action.value="updateedit";
-				document.form_index.submit();
-			  });
-		  });';
-	print '</script>'."\n";
-
-	print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
-
-	// Name
-
-	print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-	print '<input name="nom" id="name" class="minwidth200" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM: GETPOST("nom", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
-
-	// Addresse
-
-	print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
-	print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')) . '</textarea></td></tr>'."\n";
+	$tmp=explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
+	$state_id=$tmp[0];
+}
+$formcompany->select_departement($state_id, $mysoc->country_code, 'state_id');
+print '</td></tr>'."\n";
 
 
-	print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-	print '<input class="minwidth100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')) . '"></td></tr>'."\n";
+print '<tr class="oddeven"><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
+print $form->selectCurrency($conf->currency, "currency");
+print '</td></tr>'."\n";
 
 
-	print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-	print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SOCIETE_TOWN" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')) . '"></td></tr>'."\n";
-
-	// Country
-
-	print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
-	//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
-	print $form->select_country($mysoc->country_id, 'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-	print '</td></tr>'."\n";
+print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+print '<input name="tel" id="phone" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL) . '"></td></tr>';
+print '</td></tr>'."\n";
 
 
-	print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-	$state_id=0;
-	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
+print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+print '<input name="fax" id="fax" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX) . '"></td></tr>';
+print '</td></tr>'."\n";
+
+
+print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+print '<input name="mail" id="email" class="minwidth200" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL) . '"></td></tr>';
+print '</td></tr>'."\n";
+
+// Web
+print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+print '<input name="web" id="web" class="minwidth300" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB) . '"></td></tr>';
+print '</td></tr>'."\n";
+
+// Barcode
+if (! empty($conf->barcode->enabled)) {
+
+	print '<tr class="oddeven"><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
+	print '<input name="barcode" id="barcode" class="minwidth150" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GENCOD) . '"></td></tr>';
+	print '</td></tr>';
+}
+
+// Logo
+print '<tr class="oddeven"><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
+print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+print '<input type="file" class="flat minwidth200" name="logo" id="logo" accept="image/*">';
+print '</td><td class="nocellnopadd right" valign="middle">';
+if (! empty($mysoc->logo_mini)) {
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
+	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
+		print ' &nbsp; ';
+		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
+	}
+} else {
+	print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+}
+print '</td></tr></table>';
+print '</td></tr>';
+
+// Logo (squarred)
+print '<tr class="oddeven"><td><label for="logo_squarred">'.$langs->trans("LogoSquarred").' (png,jpg)</label></td><td>';
+print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+print '<input type="file" class="flat minwidth200" name="logo_squarred" id="logo_squarred" accept="image/*">';
+print '</td><td class="nocellnopadd right" valign="middle">';
+if (! empty($mysoc->logo_squarred_mini)) {
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete")).'</a>';
+	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
+		print ' &nbsp; ';
+		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini).'">';
+	}
+} else {
+	print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+}
+print '</td></tr></table>';
+print '</td></tr>';
+
+// Note
+print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_SOCIETE_NOTE).'</textarea></td></tr>';
+print '</td></tr>';
+
+print '</table>';
+
+print '<br>';
+
+// IDs of the company (country-specific)
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+$langs->load("companies");
+
+// Managing Director(s)
+
+print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS) . '"></td></tr>';
+
+// GDPR contact
+
+print '<tr class="oddeven"><td>';
+print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
+print '</td><td>';
+print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_GDPR) . '"></td></tr>';
+
+// Capital
+
+print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
+print '<input name="capital" id="capital" class="minwidth100" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL) . '"></td></tr>';
+
+// Juridical Status
+
+print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
+if ($mysoc->country_code) {
+	print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code');
+} else {
+	print $countrynotdefined;
+}
+print '</td></tr>';
+
+// ProfID1
+if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
+{
+
+	print '<tr class="oddeven"><td><label for="profid1">'.$langs->transcountry("ProfId1", $mysoc->country_code).'</label></td><td>';
+	if (! empty($mysoc->country_code))
 	{
-		$tmp=explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
-		$state_id=$tmp[0];
+		print '<input name="siren" id="profid1" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
 	}
-	$formcompany->select_departement($state_id, $mysoc->country_code, 'state_id');
-	print '</td></tr>'."\n";
-
-
-	print '<tr class="oddeven"><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
-	print $form->selectCurrency($conf->currency, "currency");
-	print '</td></tr>'."\n";
-
-
-	print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
-	print '<input name="tel" id="phone" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL) . '"></td></tr>';
-	print '</td></tr>'."\n";
-
-
-	print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
-	print '<input name="fax" id="fax" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX) . '"></td></tr>';
-	print '</td></tr>'."\n";
-
-
-	print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
-	print '<input name="mail" id="email" class="minwidth200" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL) . '"></td></tr>';
-	print '</td></tr>'."\n";
-
-	// Web
-	print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
-	print '<input name="web" id="web" class="minwidth300" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB) . '"></td></tr>';
-	print '</td></tr>'."\n";
-
-	// Barcode
-	if (! empty($conf->barcode->enabled)) {
-
-		print '<tr class="oddeven"><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
-		print '<input name="barcode" id="barcode" class="minwidth150" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GENCOD) . '"></td></tr>';
-		print '</td></tr>';
-	}
-
-	// Logo
-	print '<tr class="oddeven"><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
-	print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
-	print '<input type="file" class="flat class=minwidth200" name="logo" id="logo" accept="image/*">';
-	print '</td><td class="nocellnopadd right" valign="middle">';
-	if (! empty($mysoc->logo_mini)) {
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
-		if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
-			print ' &nbsp; ';
-			print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
-		}
-	} else {
-		print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
-	}
-	print '</td></tr></table>';
-	print '</td></tr>';
-
-	// Note
-	print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-	print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_SOCIETE_NOTE).'</textarea></td></tr>';
-	print '</td></tr>';
-
-	print '</table>';
-
-	print '<br>';
-
-	// IDs of the company (country-specific)
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-	$langs->load("companies");
-
-	// Managing Director(s)
-
-	print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-	print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS) . '"></td></tr>';
-
-	// GDPR contact
-
-	print '<tr class="oddeven"><td>';
-	print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
-	print '</td><td>';
-	print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_GDPR) . '"></td></tr>';
-
-	// Capital
-
-	print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-	print '<input name="capital" id="capital" class="minwidth100" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL) . '"></td></tr>';
-
-	// Juridical Status
-
-	print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
-	if ($mysoc->country_code) {
-		print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code');
-	} else {
+	else
+	{
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
-
-	// ProfID1
-	if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td><label for="profid1">'.$langs->transcountry("ProfId1", $mysoc->country_code).'</label></td><td>';
-		if (! empty($mysoc->country_code))
-		{
-			print '<input name="siren" id="profid1" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId2
-	if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td><label for="profid2">'.$langs->transcountry("ProfId2", $mysoc->country_code).'</label></td><td>';
-		if (! empty($mysoc->country_code))
-		{
-			print '<input name="siret" id="profid2" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '') . '">';
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId3
-	if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td><label for="profid3">'.$langs->transcountry("ProfId3", $mysoc->country_code).'</label></td><td>';
-		if (! empty($mysoc->country_code))
-		{
-			print '<input name="ape" id="profid3" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId4
-	if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td><label for="profid4">'.$langs->transcountry("ProfId4", $mysoc->country_code).'</label></td><td>';
-		if (! empty($mysoc->country_code))
-		{
-			print '<input name="rcs" id="profid4" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId5
-	if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td><label for="profid5">'.$langs->transcountry("ProfId5", $mysoc->country_code).'</label></td><td>';
-		if (! empty($mysoc->country_code))
-		{
-			print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId6
-	if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td><label for="profid6">'.$langs->transcountry("ProfId6", $mysoc->country_code).'</label></td><td>';
-		if (! empty($mysoc->country_code))
-		{
-			print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
-	}
-
-	// TVA Intra
-
-	print '<tr class="oddeven"><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
-	print '<input name="tva" id="intra_vat" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
-	print '</td></tr>';
-
-	// Object of the company
-
-	print '<tr class="oddeven"><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
-	print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
-	print '</td></tr>';
-
-	print '</table>';
-
-
-	// Fiscal year start
-	print '<br>';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
-	print "</tr>\n";
-
-	print '<tr class="oddeven"><td><label for="SOCIETE_FISCAL_MONTH_START">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
-	print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START, 'SOCIETE_FISCAL_MONTH_START', 0, 1, 'maxwidth100') . '</td></tr>';
-
-	print "</table>";
-
-
-	// Fiscal options
-	print '<br>';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td width="140">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
-	print '<td class="right">&nbsp;</td>';
-	print "</tr>\n";
-
-
-	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
-	print '<td colspan="2">';
-	print "<table>";
-	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
-	if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
-	print "</table>";
-	print "</td></tr>\n";
-
-
-	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
-	print '<td colspan="2">';
-	print "<table>";
-	print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
-	if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
-	print "</table>";
-	print "</td></tr>\n";
-
-	print "</table>";
-
-	/*
-	 *  Local Taxes
-	 */
-	if ($mysoc->useLocalTax(1))
-	{
-		// Local Tax 1
-		print '<br>';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td width="140">'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-		print '<td class="right">&nbsp;</td>';
-		print "</tr>\n";
-
-		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print '<table class="nobordernopadding">';
-		print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		if(! isOnlyOneLocalTax(1))
-		{
-			print '<tr><td class="left"><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
-			$formcompany->select_localtax(1, $conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
-		    print '</td></tr>';
-		}
-
-		$opcions=array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"),$langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"),$langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc"));
-
-		print '<tr><td class="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
-		print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
-		print '</td></tr>';
-		print "</table>";
-		print "</td></tr>\n";
-
-
-		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print "<table>";
-		print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		print "</table>";
-		print "</td></tr>\n";
-		print "</table>";
-	}
-	if ($mysoc->useLocalTax(2))
-	{
-		// Local Tax 2
-		print '<br>';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-		print '<td class="right">&nbsp;</td>';
-		print "</tr>\n";
-
-
-		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print '<table class="nobordernopadding">';
-		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		if(! isOnlyOneLocalTax(2))
-		{
-		    print '<tr><td class="left"><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
-		    $formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
-			print '</td></tr>';
-		}
-		print '<tr><td class="left"><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
-		print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
-		print '</td></tr>';
-		print "</table>";
-		print "</td></tr>\n";
-
-
-		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print "<table>";
-		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		print "</table>";
-		print "</td></tr>\n";
-		print "</table>";
-	}
-
-
-	print '<br><div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-	print '<br>';
-
-	print '</form>';
 }
-else
+
+// ProfId2
+if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-')
 {
-	/*
-	 * Show parameters
-	 */
 
-	// Actions buttons
-	//print '<div class="tabsAction">';
-	//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-	//print '</div><br>';
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-
-	print '<tr class="oddeven"><td class="titlefield wordbreak">'.$langs->trans("CompanyName").'</td><td>';
-	if (! empty($conf->global->MAIN_INFO_SOCIETE_NOM)) print $conf->global->MAIN_INFO_SOCIETE_NOM;
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyName")).'</font>';
-	print '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyCountry").'</td><td>';
-	if ($mysoc->country_code)
+	print '<tr class="oddeven"><td><label for="profid2">'.$langs->transcountry("ProfId2", $mysoc->country_code).'</label></td><td>';
+	if (! empty($mysoc->country_code))
 	{
-		$img=picto_from_langcode($mysoc->country_code);
-		print $img?$img.' ':'';
-		print getCountry($mysoc->country_code, 1);
-	}
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-	print '</td></tr>';
-
-
-	if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr class="oddeven"><td>'.$langs->trans("Region-State").'</td><td>';
-	else print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
-	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
-	{
-		$tmp=explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
-		$state_id=$tmp[0];
-		print getState($state_id, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
-	}
-	print '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyCurrency").'</td><td>';
-	print currency_name($conf->currency, 0);
-	print ' ('.$conf->currency;
-	print ($conf->currency != $langs->getCurrencySymbol($conf->currency) ? ' - '.$langs->getCurrencySymbol($conf->currency) : '');
-	print ')';
-	print ' - '.$langs->trans("PriceFormatInCurrentLanguage", $langs->defaultlang).' : '.price(price2num('99.333333333', 'MT'), 1, $langs, 1, -1, -1, $conf->currency);
-	print '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL, $mysoc->country_code) . '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX, $mysoc->country_code) . '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL, 0, 0, 0, 80) . '</td></tr>';
-
-	// Web
-
-	print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>';
-	$arrayofurl = preg_split('/\s/', $conf->global->MAIN_INFO_SOCIETE_WEB);
-	foreach($arrayofurl as $urltoshow)
-	{
-		if ($urltoshow) print dol_print_url($urltoshow, '_blank', 80);
-	}
-	print '</td></tr>';
-
-	// Barcode
-
-	if (! empty($conf->barcode->enabled))
-	{
-		print '<tr class="oddeven"><td>'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';
-	}
-
-	// Logo
-
-	print '<tr class="oddeven"><td>'.$langs->trans("Logo").'</td><td>';
-
-	$tagtd='tagtd ';
-	if ($conf->browser->layout == 'phone') $tagtd='';
-	print '<div class="tagtable centpercent"><div class="tagtr inline-block centpercent valignmiddle"><div class="'.$tagtd.'inline-block valignmiddle left">';
-	print $mysoc->logo;
-	print '</div><div class="'.$tagtd.'inline-block valignmiddle left">';
-
-	// It offers the generation of the thumbnail if it does not exist
-	if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i', $mysoc->logo))
-	{
-		print '<a class="img_logo" href="'.$_SERVER["PHP_SELF"].'?action=addthumb&amp;file='.urlencode($mysoc->logo).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'</a>&nbsp;&nbsp;';
-	}
-	elseif ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
-	{
-		print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
+		print '<input name="siret" id="profid2" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '') . '">';
 	}
 	else
 	{
-		print '<img class="img_logo" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+		print $countrynotdefined;
 	}
-	print '</div></div></div>';
-
 	print '</td></tr>';
+}
 
+// ProfId3
+if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-')
+{
 
-	print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . '</td></tr>';
-
-	print '</table>';
-	print "</div>";
-
-	print '<br>';
-
-
-	// IDs of the company (country-specific)
-	print '<form name="formsoc" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield wordbreak">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-	// Managing Director(s)
-
-	print '<tr class="oddeven"><td>'.$langs->trans("ManagingDirectors").'</td><td>';
-	print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
-
-	// GDPR Contact
-
-	print '<tr class="oddeven"><td>'.$langs->trans("GDPRContact").'</td><td>';
-	print $conf->global->MAIN_INFO_GDPR . '</td></tr>';
-
-	// Capital
-
-	print '<tr class="oddeven"><td>'.$langs->trans("Capital").'</td><td>';
-	print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
-
-	// Juridical Status
-
-	print '<tr class="oddeven"><td>'.$langs->trans("JuridicalStatus").'</td><td>';
-	print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
-	print '</td></tr>';
-
-	// ProfId1
-	if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
+	print '<tr class="oddeven"><td><label for="profid3">'.$langs->transcountry("ProfId3", $mysoc->country_code).'</label></td><td>';
+	if (! empty($mysoc->country_code))
 	{
-
-		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</td><td>';
-		if (! empty($conf->global->MAIN_INFO_SIREN))
-		{
-			print $conf->global->MAIN_INFO_SIREN;
-			$s = $mysoc->id_prof_url(1, $mysoc);
-			if ($s) print ' - '.$s;
-		} else {
-			print '&nbsp;';
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId2
-	if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId2", $mysoc->country_code).'</td><td>';
-		if (! empty($conf->global->MAIN_INFO_SIRET))
-		{
-			print $conf->global->MAIN_INFO_SIRET;
-			$s = $mysoc->id_prof_url(2, $mysoc);
-			if ($s) print ' - '.$s;
-		} else {
-			print '&nbsp;';
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId3
-	if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId3", $mysoc->country_code).'</td><td>';
-		if (! empty($conf->global->MAIN_INFO_APE))
-		{
-			print $conf->global->MAIN_INFO_APE;
-			$s = $mysoc->id_prof_url(3, $mysoc);
-			if ($s) print ' - '.$s;
-		} else {
-			print '&nbsp;';
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId4
-	if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId4", $mysoc->country_code).'</td><td>';
-		if (! empty($conf->global->MAIN_INFO_RCS))
-		{
-			print $conf->global->MAIN_INFO_RCS;
-			$s = $mysoc->id_prof_url(4, $mysoc);
-			if ($s) print ' - '.$s;
-		} else {
-			print '&nbsp;';
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId5
-	if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId5", $mysoc->country_code).'</td><td>';
-		if (! empty($conf->global->MAIN_INFO_PROFID5))
-		{
-			print $conf->global->MAIN_INFO_PROFID5;
-			$s = $mysoc->id_prof_url(5, $mysoc);
-			if ($s) print ' - '.$s;
-		} else {
-			print '&nbsp;';
-		}
-		print '</td></tr>';
-	}
-
-	// ProfId6
-	if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
-	{
-
-		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId6", $mysoc->country_code).'</td><td>';
-		if (! empty($conf->global->MAIN_INFO_PROFID6))
-		{
-			print $conf->global->MAIN_INFO_PROFID6;
-			$s = $mysoc->id_prof_url(6, $mysoc);
-			if ($s) print ' - '.$s;
-		} else {
-			print '&nbsp;';
-		}
-		print '</td></tr>';
-	}
-
-	// VAT
-
-	print '<tr class="oddeven"><td>'.$langs->trans("VATIntra").'</td>';
-	print '<td>';
-	if (! empty($conf->global->MAIN_INFO_TVAINTRA))
-	{
-		$s='';
-		$s.=$conf->global->MAIN_INFO_TVAINTRA;
-		$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$conf->global->MAIN_INFO_TVAINTRA.'">';
-		if (empty($conf->global->MAIN_DISABLEVATCHECK) && $mysoc->isInEEC())
-		{
-			$s.=' - ';
-			if (! empty($conf->use_javascript_ajax))
-			{
-				print "\n";
-				print '<script language="JavaScript" type="text/javascript">';
-				print "function CheckVAT(a) {\n";
-				print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n";
-				print "}\n";
-				print '</script>';
-				print "\n";
-				$s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-				$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-			}
-			else
-			{
-				$s.='<a href="'.$langs->transcountry("VATIntraCheckURL", $soc->id_country).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
-			}
-		}
-		print $s;
+		print '<input name="ape" id="profid3" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
 	}
 	else
 	{
-		print '&nbsp;';
+		print $countrynotdefined;
 	}
-	print '</td>';
-	print '</tr>';
+	print '</td></tr>';
+}
+
+// ProfId4
+if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-')
+{
+
+	print '<tr class="oddeven"><td><label for="profid4">'.$langs->transcountry("ProfId4", $mysoc->country_code).'</label></td><td>';
+	if (! empty($mysoc->country_code))
+	{
+		print '<input name="rcs" id="profid4" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
+	}
+	else
+	{
+		print $countrynotdefined;
+	}
+	print '</td></tr>';
+}
+
+// ProfId5
+if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-')
+{
+
+	print '<tr class="oddeven"><td><label for="profid5">'.$langs->transcountry("ProfId5", $mysoc->country_code).'</label></td><td>';
+	if (! empty($mysoc->country_code))
+	{
+		print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
+	}
+	else
+	{
+		print $countrynotdefined;
+	}
+	print '</td></tr>';
+}
+
+// ProfId6
+if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
+{
+
+	print '<tr class="oddeven"><td><label for="profid6">'.$langs->transcountry("ProfId6", $mysoc->country_code).'</label></td><td>';
+	if (! empty($mysoc->country_code))
+	{
+		print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
+	}
+	else
+	{
+		print $countrynotdefined;
+	}
+	print '</td></tr>';
+}
+
+// TVA Intra
+
+print '<tr class="oddeven"><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
+print '<input name="tva" id="intra_vat" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
+print '</td></tr>';
+
+// Object of the company
+
+print '<tr class="oddeven"><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
+print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
+print '</td></tr>';
+
+print '</table>';
 
 
-	print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("CompanyObject").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . '</td></tr>';
+// Fiscal year start
+print '<br>';
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
 
-	print '</table>';
-	print "</div>";
+print '<tr class="oddeven"><td><label for="SOCIETE_FISCAL_MONTH_START">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
+print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START, 'SOCIETE_FISCAL_MONTH_START', 0, 1, 'maxwidth100') . '</td></tr>';
 
-	print '</form>';
+print "</table>";
 
-	/*
-	 *  fiscal year beginning
-	 */
+
+// Fiscal options
+print '<br>';
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td width="140">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
+print '<td class="right">&nbsp;</td>';
+print "</tr>\n";
+
+
+print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+print '<td colspan="2">';
+print "<table>";
+print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
+if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
+print "</table>";
+print "</td></tr>\n";
+
+
+print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+print '<td colspan="2">';
+print "<table>";
+print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
+if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
+print "</table>";
+print "</td></tr>\n";
+
+print "</table>";
+
+/*
+ *  Local Taxes
+ */
+if ($mysoc->useLocalTax(1))
+{
+	// Local Tax 1
 	print '<br>';
-
-	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
+	print '<td width="140">'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
+	print '<td class="right">&nbsp;</td>';
 	print "</tr>\n";
 
+	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
+	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
+	print '<td colspan="2">';
+	print '<table class="nobordernopadding">';
+	print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
+	$example=$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
+	print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
+	if(! isOnlyOneLocalTax(1))
+	{
+		print '<tr><td class="left"><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
+		$formcompany->select_localtax(1, $conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
+	    print '</td></tr>';
+	}
 
-	print '<tr class="oddeven"><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
-	$monthstart=(! empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1;
-	print dol_print_date(dol_mktime(12, 0, 0, $monthstart, 1, 2000, 1), '%B', 'gm') . '</td></tr>';
+	$opcions=array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"),$langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"),$langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc"));
 
+	print '<tr><td class="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
+	print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
+	print '</td></tr>';
 	print "</table>";
-	print "</div>";
+	print "</td></tr>\n";
 
-	/*
-	 *  tax options
-	 */
+
+	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
+	print '<td colspan="2">';
+	print "<table>";
+	print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
+	$example=$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
+	print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
+	print "</table>";
+	print "</td></tr>\n";
+	print "</table>";
+}
+if ($mysoc->useLocalTax(2))
+{
+	// Local Tax 2
 	print '<br>';
-	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td class="titlefield">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td class="right">&nbsp;</td>';
 	print "</tr>\n";
 
 
-	print '<tr class="oddeven"><td class="titlefield">';
-	print "<input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
+	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
+	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
-	print "<table>";
-	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
-	if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
+	print '<table class="nobordernopadding">';
+	print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
+	$example=$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
+	print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
+	if(! isOnlyOneLocalTax(2))
+	{
+	    print '<tr><td class="left"><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
+	    $formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
+		print '</td></tr>';
+	}
+	print '<tr><td class="left"><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
+	print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
+	print '</td></tr>';
 	print "</table>";
 	print "</td></tr>\n";
 
 
-	print '<tr class="oddeven"><td class="titlefield">';
-	print "<input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print "<table>";
-	print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
-	if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
+	print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
+	$example=$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
+	print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
 	print "</table>";
 	print "</td></tr>\n";
-
 	print "</table>";
-	print "</div>";
-
-	/*
-	 *  Local Taxes
-	 */
-	if ($mysoc->useLocalTax(1))    // True if we found at least on vat with a setup adding a localtax 1
-	{
-		// Local Tax 1
-		print '<br>';
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td class="titlefield">'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-		print '<td class="right">&nbsp;</td>';
-		print "</tr>\n";
-
-
-		print "<tr class=\"oddeven\"><td>";
-		print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print "<table>";
-		print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		if($conf->global->MAIN_INFO_VALUE_LOCALTAX1!=0)
-		{
-			print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>';
-		}
-		print '<tr><td class="left">'.$langs->trans("CalcLocaltax").': ';
-		if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0)
-		{
-			print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
-		}
-		elseif($conf->global->MAIN_INFO_LOCALTAX_CALC1==1)
-		{
-			print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
-		}
-		elseif($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){
-			print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
-		}
-
-		print '</td></tr>';
-		print "</table>";
-		print "</td></tr>\n";
-
-
-		print '<tr class="oddeven"><td>';
-		print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print "<table>";
-		print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		print "</table>";
-		print "</td></tr>\n";
-
-		print "</table>";
-		print "</div>";
-	}
-	if ($mysoc->useLocalTax(2))    // True if we found at least on vat with a setup adding a localtax 1
-	{
-		// Local Tax 2
-		print '<br>';
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td class="titlefield">'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-		print '<td class="right">&nbsp;</td>';
-		print "</tr>\n";
-
-
-		print "<tr class=\"oddeven\"><td>";
-		print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print "<table>";
-		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		if($conf->global->MAIN_INFO_VALUE_LOCALTAX2!=0)
-		{
-			print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>';
-		}
-		print '<tr><td class="left">'.$langs->trans("CalcLocaltax").': ';
-		if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0)
-		{
-			print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
-		}
-		elseif($conf->global->MAIN_INFO_LOCALTAX_CALC2==1)
-		{
-			print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
-		}
-		elseif($conf->global->MAIN_INFO_LOCALTAX_CALC2==2)
-		{
-			print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
-		}
-
-		print '</td></tr>';
-		print "</table>";
-		print "</td></tr>\n";
-
-
-		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
-		print '<td colspan="2">';
-		print "<table>";
-		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
-		$example=$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
-		print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n":"");
-		print "</table>";
-		print "</td></tr>\n";
-
-		print "</table>";
-		print "</div>";
-	}
-
-
-	// Actions buttons
-	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a></div>';
-	print '</div>';
 }
 
+
+print '<br><div class="center">';
+print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 47f668f69c3..d69a14deb2e 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -174,8 +174,8 @@ llxHeader();
 
 print load_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"), '', 'title_setup');
 
-print $langs->transnoentities("DelaysOfToleranceDesc", img_warning());
-print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')."<br>\n";
+print '<span class="opacitymedium">'.$langs->transnoentities("DelaysOfToleranceDesc", img_warning());
+print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')."</span><br>\n";
 print "<br>\n";
 
 $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index b07a7984e09..dfbb548f5e0 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -222,375 +222,218 @@ $formadmin=new FormAdmin($db);
 print load_fiche_titre($langs->trans("GUISetup"), '', 'title_setup');
 
 print '<span class="opacitymedium">'.$langs->trans("DisplayDesc")."</span><br>\n";
-print "<br>\n";
 
+//WYSIWYG Editor
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-if ($action == 'edit')	// Edit
+print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+
+clearstatcache();
+
+print '<br>';
+print '<table summary="edit" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Default language
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
+print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, 0, 0, 0, 0, 'minwidth300', 2);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Multilingual GUI
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>';
+print $form->selectyesno('MAIN_MULTILANGS', $conf->global->MAIN_MULTILANGS, 1);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+print '</table><br>'."\n";
+
+// Themes and themes options
+showSkins(null, 1);
+print '<br>';
+
+// Other
+print '<table summary="otherparameters" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Miscellaneous").'</td><td></td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Disable javascript and ajax
+print '<tr class="oddeven"><td>'.$langs->trans("DisableJavascript").'</td><td>';
+print $form->selectyesno('MAIN_DISABLE_JAVASCRIPT', isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0, 1);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Max size of lists
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Max size of short lists on customer card
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// show input border
+/*
+ print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
+ print $form->selectyesno('main_showInputBorder',isset($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)?$conf->global->THEME_ELDY_SHOW_BORDER_INPUT:0,1);
+ print '</td>';
+ print '<td width="20">&nbsp;</td>';
+ print '</tr>';
+ */
+
+// First day for weeks
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
+print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'), 'MAIN_START_WEEK', 0);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// DefaultWorkingDays
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5').'">';
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// DefaultWorkingHours
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18').'">';
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Firstname/Name
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"), 1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
+print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Hide unauthorized button
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
+print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0, 1);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Hide version link
+/*
+
+print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
+print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+*/
+
+// Show bugtrack link
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK', $conf->global->MAIN_BUGTRACK_ENABLELINK, 1);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Hide wiki link on login page
+$pictohelp='<span class="fa fa-question-circle"></span>';
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp", $pictohelp).'</td><td>';
+print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0, 1);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Message of the day on home page
+$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'));
+complete_substitutions_array($substitutionarray, $langs);
+
+print '<tr class="oddeven"><td class="titlefield">';
+$texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+foreach($substitutionarray as $key => $val)
 {
-	//WYSIWYG Editor
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-
-	print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-
-	clearstatcache();
-
-	print '<br>';
-	print '<table summary="edit" class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Default language
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
-	print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, 0, 0, 0, 0, 'minwidth300', 2);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Multilingual GUI
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>';
-	print $form->selectyesno('MAIN_MULTILANGS', $conf->global->MAIN_MULTILANGS, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	print '</table><br>'."\n";
-
-	// Themes and themes options
-	showSkins(null, 1);
-	print '<br>';
-
-	// Other
-	print '<table summary="otherparameters" class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Disable javascript and ajax
-	print '<tr class="oddeven"><td>'.$langs->trans("DisableJavascript").'</td><td>';
-	print $form->selectyesno('MAIN_DISABLE_JAVASCRIPT', isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Max size of lists
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Max size of short lists on customer card
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// show input border
-	/*
-    print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
-    print $form->selectyesno('main_showInputBorder',isset($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)?$conf->global->THEME_ELDY_SHOW_BORDER_INPUT:0,1);
-    print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-    */
-
-	// First day for weeks
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
-	print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'), 'MAIN_START_WEEK', 0);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// DefaultWorkingDays
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
-	print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5').'">';
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// DefaultWorkingHours
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
-	print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18').'">';
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Firstname/Name
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("FirstnameNamePosition").'</td><td>';
-	$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"), 1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
-	print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Hide unauthorized button
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
-	print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Show logo
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
-	print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Hide version link
-	/*
-
-	print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
-	print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-    */
-
-	// Show bugtrack link
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
-	print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK', $conf->global->MAIN_BUGTRACK_ENABLELINK, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Hide wiki link on login page
-	$pictohelp='<span class="fa fa-question-circle"></span>';
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp", $pictohelp).'</td><td>';
-	print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Message of the day on home page
-	$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'));
-	complete_substitutions_array($substitutionarray, $langs);
-
-	print '<tr class="oddeven"><td class="titlefield">';
-	$texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-	foreach($substitutionarray as $key => $val)
-	{
-		$texthelp.=$key.'<br>';
-	}
-	print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday');
-
-	print '</td><td colspan="2">';
-
-	$doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
-	$doleditor->Create();
-
-	print '</td></tr>'."\n";
-
-	print '</table>'."\n";
-
-	print '<br>';
-
-	// Other
-	print '<table summary="edit" class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LoginPage").'</td><td></td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Message on login page
-	$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount','user'));
-	complete_substitutions_array($substitutionarray, $langs);
-	print '<tr class="oddeven"><td>';
-	$texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-	foreach($substitutionarray as $key => $val)
-	{
-		$texthelp.=$key.'<br>';
-	}
-	print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessagelogin');
-	print '</td><td colspan="2">';
-	$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
-	$doleditor->Create();
-	print '</td></tr>'."\n";
-
-	// Hide helpcenter link on login page
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
-	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK', isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Background
-	print '<tr class="oddeven"><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
-	print '<div class="centpercent inline-block">';
-	print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground">';
-	if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin">'.img_delete($langs->trans("Delete")).'</a>';
-		if (file_exists($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND)) {
-			print ' &nbsp; ';
-			print '<img class="paddingleft valignmiddle" width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
-		}
-	} else {
-		print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
-	}
-	print '</div>';
-	print '</td></tr>';
-
-	print '</table>'."\n";
-
-
-	print '<br>';
-	print '<div class="center">';
-	print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-	print '<br>';
-
-	print '</form>';
+	$texthelp.=$key.'<br>';
 }
-else	// Show
+print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday');
+
+print '</td><td colspan="2">';
+
+$doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
+$doleditor->Create();
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+
+print '<br>';
+
+// Other
+print '<table summary="edit" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LoginPage").'</td><td></td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Message on login page
+$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount','user'));
+complete_substitutions_array($substitutionarray, $langs);
+print '<tr class="oddeven"><td>';
+$texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+foreach($substitutionarray as $key => $val)
 {
-	// Language
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
-
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
-	$s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
-	print ($s?$s.' ':'');
-	print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
-	print '</td>';
-	print '<td width="20">';
-	if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation".($conf->global->MAIN_LANG_DEFAULT=='en_US'?'ENUS':''), $conf->global->MAIN_LANG_DEFAULT), 1);
-	print '</td>';
-	print "</tr>";
-
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print "</tr>";
-
-	print '</table><br>'."\n";
-
-
-	// Themes
-	showSkins(null, 0);
-	print '<br>';
-
-
-	// Other
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-	// Disable javascript/ajax
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableJavascript").'</td><td>';
-	print yn($conf->global->MAIN_DISABLE_JAVASCRIPT);
-	print ' <span class="opacitymedium"> &nbsp; - &nbsp; '.$langs->trans("DisableJavascriptNote").'</span>';
-	print "</td>";
-	print "</tr>";
-
-	// Max size of lists
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
-	print "</tr>";
-
-	// Max size of short lists
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
-	print "</tr>";
-
-	// First day for weeks
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
-	print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'));
-	print '</td>';
-	print '</tr>';
-
-	// DefaultWorkingDays
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
-	print isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5';
-	print '</td>';
-	print '</tr>';
-
-	// DefaultWorkingHours
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
-	print isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18';
-	print '</td>';
-	print '</tr>';
-
-	// Firstname / Name position
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("FirstnameNamePosition").'</td><td>';
-	if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Lastname"); }
-	else { print $langs->trans("Lastname").' '.$langs->trans("Firstname"); }
-	print '</td>';
-	print '</tr>';
-
-	// Hide unauthorized button
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
-	print yn((isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0), 1);
-	print '</td></tr>';
-
-	// Show logo
-	print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
-	print "</tr>";
-
-	// Hide version link
-	/*
-	 print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
-	 print yn($conf->global->MAIN_HIDE_VERSION);
-	 print '</td>';
-	 print '</tr>';
-	 */
-
-	// Show bugtrack link
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
-	print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
-	print "</tr>";
-
-	// Link to wiki help
-	$pictohelp='<span class="fa fa-question-circle"></span>';
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp", $pictohelp).'</td><td>';
-	print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0), 1);
-	print '</td></tr>';
-
-	// Message of the day
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td>';
-	if (isset($conf->global->MAIN_MOTD)) print dol_htmlcleanlastbr($conf->global->MAIN_MOTD);
-	else print '&nbsp;';
-	print '</td></tr>'."\n";
-
-	print '</table>'."\n";
-
-	print '<br>';
-
-	// Login page
-	print '<div class="div-table-responsive">';
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td></tr>';
-
-	// Message login
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageLogin").'</td><td>';
-	if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
-	else print '&nbsp;';
-	print '</td></tr>'."\n";
-
-	// Link to help center
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
-	print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0), 1);
-	print '</td></tr>';
-
-	// Background login
-	print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td>';
-	print '<div class="centpercent inline-block">';
-	print $conf->global->MAIN_LOGIN_BACKGROUND;
-	if ($conf->global->MAIN_LOGIN_BACKGROUND && is_file($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND))
-	{
-		print '<img class="img_logo paddingleft valignmiddle" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
-	}
-	else
-	{
-		print '<img class="img_logo paddingleft valignmiddle" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
-	}
-	print '</div>';
-	print '</td></tr>';
-
-	print '</table>'."\n";
-	print '</div>';
-
-	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-	print '</div>';
+	$texthelp.=$key.'<br>';
 }
+print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessagelogin');
+print '</td><td colspan="2">';
+$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
+$doleditor->Create();
+print '</td></tr>'."\n";
+
+// Hide helpcenter link on login page
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
+print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK', isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0, 1);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
+// Background
+print '<tr class="oddeven"><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
+print '<div class="centpercent inline-block">';
+$disabled = '';
+if (! empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) $disabled = ' disabled="disabled"';
+print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground"'.$disabled.'>';
+if ($disabled)
+{
+	print '('.$langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND").') ';
+}
+if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin">'.img_delete($langs->trans("Delete")).'</a>';
+	if (file_exists($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND)) {
+		print ' &nbsp; ';
+		print '<img class="paddingleft valignmiddle" width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
+	}
+} else {
+	print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+}
+print '</div>';
+print '</td></tr>';
+
+print '</table>'."\n";
+
+
+print '<br>';
+print '<div class="center">';
+print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index c9e69cc469e..ea19b7034a6 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -90,7 +90,7 @@ llxHeader();
 print load_fiche_titre($langs->trans("LimitsSetup"), '', 'title_setup');
 
 
-print $langs->trans("LimitsDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("LimitsDesc")."</span><br>\n";
 print "<br>\n";
 
 if ($action == 'edit')
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index b334ccadf45..4187c4d3eb4 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -159,116 +159,63 @@ print '<span class="opacitymedium">'.$langs->trans("MenusDesc")."</span><br>\n";
 print "<br>\n";
 
 
-if ($action == 'edit')
-{
-	clearstatcache();
+clearstatcache();
 
-	// Gestionnaires de menu
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("ExternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '</tr>';
+// Gestionnaires de menu
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
+print '<td>';
+print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc"));
+print '</td>';
+print '<td>';
+print $form->textwithpicto($langs->trans("ExternalUsers"), $langs->trans("InternalExternalDesc"));
+print '</td>';
+print '</tr>';
 
-	// Menu top
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled');
-	print '</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled');
-	print '</td>';
-	print '</tr>';
+// Menu top
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled');
+print '</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled');
+print '</td>';
+print '</tr>';
 
-	// Menu smartphone
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
-	print '</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled');
-	print '</td>';
-	print '</tr>';
+// Menu smartphone
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
 
-	print '</table>';
-}
-else
-{
-	// Gestionnaires de menu
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("ExternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '</tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED));
-	print $filelib;
-	print '</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED));
-	print $filelib;
-	print '</td>';
-	print '</tr>';
-
-
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED));
-	print $filelib;
-	if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE_FORCED)
+if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE_FORCED)
 	|| (empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && ! empty($conf->global->MAIN_MENU_SMARTPHONE) && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE)))
-	{
-		print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
-	}
-	print '</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED));
-	print $filelib;
-	if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)
-	|| (empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED) && ! empty($conf->global->MAIN_MENU_SMARTPHONE) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE)))
-	{
-		print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
-	}
-	print '</td>';
-	print '</tr>';
-
-	print '</table>';
+{
+	print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
 }
 
+print '</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled');
+
+if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)
+	|| (empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED) && ! empty($conf->global->MAIN_MENU_SMARTPHONE) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE)))
+{
+	print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
+}
+
+print '</td>';
+print '</tr>';
+
+print '</table>';
+
 dol_fiche_end();
 
-
-if ($action == 'edit')
-{
-	print '<div class="center">';
-	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; &nbsp; &nbsp; ';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-}
+print '<div class="center">';
+print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
 
 print '</form>';
 
-
-if ($action != 'edit')
-{
-	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-	print '</div>';
-}
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index a8c1aa41b5f..e9346f49a3a 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -123,460 +123,244 @@ print "<br>\n";
 
 $noCountryCode = (empty($mysoc->country_code) ? true : false);
 
-if ($action == 'edit')	// Edit
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+
+clearstatcache();
+
+
+// Misc options
+print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+$selected=$conf->global->MAIN_PDF_FORMAT;
+if (empty($selected)) $selected=dol_getDefaultFormat();
+
+// Show pdf format
+
+print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
+print $formadmin->select_paper_format($selected, 'MAIN_PDF_FORMAT');
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_LEFT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT).'">';
+print '</td></tr>';
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_RIGHT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT).'">';
+print '</td></tr>';
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_TOP" value="'.(empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP).'">';
+print '</td></tr>';
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_BOTTOM" value="'.(empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM).'">';
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+
+// Addresses
+print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+// Hide VAT Intra on address
+
+print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
+print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS', (! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0, 1);
+print '</td></tr>';
+
+// Show prof id in address into pdf
+for($i=1; $i<=6; $i++)
 {
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="update">';
-
-    clearstatcache();
-
-
-    // Misc options
-    print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    $selected=$conf->global->MAIN_PDF_FORMAT;
-    if (empty($selected)) $selected=dol_getDefaultFormat();
-
-    // Show pdf format
-
-    print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
-    print $formadmin->select_paper_format($selected, 'MAIN_PDF_FORMAT');
-    print '</td></tr>';
-
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_LEFT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT).'">';
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_RIGHT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT).'">';
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_TOP" value="'.(empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP).'">';
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_BOTTOM" value="'.(empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM).'">';
-    print '</td></tr>';
-
-    print '</table>';
-	print '</div>';
-
-	print '<br>';
-
-
-    // Addresses
-    print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    // Hide VAT Intra on address
-
-    print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
-    print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS', (! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0, 1);
-    print '</td></tr>';
-
-    // Show prof id in address into pdf
-    for($i=1; $i<=6; $i++)
-    {
-        if (! $noCountryCode)
-        {
-            $pid=$langs->transcountry("ProfId".$i, $mysoc->country_code);
-            if ($pid == '-') $pid=false;
-        }
-        else
-        {
-            $pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-        }
-        if ($pid)
-        {
-            print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
-            $keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
-            print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant)?$conf->global->$keyforconstant:0, 1, $noCountryCode);
-            print '</td></tr>';
-        }
-    }
-
-	print '</table>';
-	print '</div>';
-
-
-    print '<br>';
-
-
-    // Localtaxes
-    $locales ='';
-    $text='';
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
-    {
-        if ($mysoc->useLocalTax(1))
-        {
-            $locales = $langs->transcountry("LT1", $mysoc->country_code);
-            $text ='<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)) . '</td><td>';
-            $text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_SECOND_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX : 0, 1);
-            $text .= '</td></tr>';
-        }
-
-        if ($mysoc->useLocalTax(2))
-        {
-            $locales.=($locales?' & ':'').$langs->transcountry("LT2", $mysoc->country_code);
-
-            $text.= '<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)) . '</td><td>';
-            $text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_THIRD_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX : 0, 1);
-            $text.= '</td></tr>';
-        }
-    }
-
-    $title = $langs->trans("PDFRulesForSalesTax");
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
-    {
-   		$title.=' - '.$langs->trans("PDFLocaltax", $locales);
-    }
-
-    print load_fiche_titre($title, '', '');
-
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    // Hide any information on Sale tax / VAT
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0, 1);
-    print '</td></tr>';
-
-    // Locataxes
-    print $text;
-
-    print '</table>';
-    print '<br>';
-
-
-    // Other
-    print load_fiche_titre($langs->trans("Other"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    //Desc
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0, 1);
-    print '</td></tr>';
-
-    //Ref
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0, 1);
-    print '</td></tr>';
-
-    //Details
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0, 1);
-    print '</td></tr>';
-
-	//Invert sender and recipient
-
-	print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
-	print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT))?$conf->global->MAIN_INVERT_SENDER_RECIPIENT:0, 1);
-	print '</td></tr>';
-
- 	// Place customer adress to the ISO location
-
-    print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
-	print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0, 1);
-    print '</td></tr>';
-
-
-    print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
-	print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
-	print '</td></tr>';
-
-	print '</table>';
-	print '</div>';
-
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-    print ' &nbsp; ';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-
-    print '</form>';
-    print '<br>';
-}
-else	// Show
-{
-    // Misc options
-    print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
-
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    // Show pdf format
-
-    print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
-
-    $pdfformatlabel='';
-    if (empty($conf->global->MAIN_PDF_FORMAT))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $pdfformatlabel=dol_getDefaultFormat();
-    }
-    else $pdfformatlabel=$conf->global->MAIN_PDF_FORMAT;
-    if (! empty($pdfformatlabel))
-    {
-    	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
-        $sql.=" WHERE code LIKE '%".$db->escape($pdfformatlabel)."%'";
-
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $obj=$db->fetch_object($resql);
-            $paperKey = $langs->trans('PaperFormat'.$obj->code);
-            $unitKey = $langs->trans('SizeUnit'.$obj->unit);
-            $pdfformatlabel = ($paperKey == 'PaperFormat'.$obj->code ? $obj->label : $paperKey).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
-        }
-    }
-    print $pdfformatlabel;
-    print '</td></tr>';
-
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT;
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT;
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP;
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM;
-    print '</td></tr>';
-
-	print '</table>';
-	print '</div>';
-
-	print '<br>';
-
-	print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-	// Hide Intra VAT on address
-
-	print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS, 1);
-	print '</td></tr>';
-
-	// Show prof id in address into pdf
-	for ($i=1; $i<=6; $i++)
+	if (! $noCountryCode)
 	{
-	    if (! $noCountryCode)
-	    {
-	        $pid=$langs->transcountry("ProfId".$i, $mysoc->country_code);
-	        if ($pid == '-') $pid=false;
-	    }
-	    else
-	    {
-	        $pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-	    }
-	    if ($pid)
-	    {
-	        print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
-	        $keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
-	        print yn($conf->global->$keyforconstant, 1);
-	        print '</td></tr>';
-	    }
-	}
-
-    print '</table>'."\n";
-	print '</div>';
-
-    print '<br>';
-
-    // Localtaxes
-    $locales ='';
-    $text='';
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
-    {
-        if ($mysoc->useLocalTax(1))
-        {
-            $locales = $langs->transcountry("LT1", $mysoc->country_code);
-            $text ='<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)) . '</td><td>';
-            $text .= yn($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX, 1);
-            $text .= '</td></tr>';
-        }
-
-        if ($mysoc->useLocalTax(2))
-        {
-            $locales.=($locales?' & ':'').$langs->transcountry("LT2", $mysoc->country_code);
-
-            $text.= '<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)) . '</td><td>';
-            $text.= yn($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX, 1);
-            $text.= '</td></tr>';
-        }
-    }
-
-    // Sales TAX / VAT information
-    $title=$langs->trans("PDFRulesForSalesTax", $locales);
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) $title.=' - '.$langs->trans("PDFLocaltax", $locales);
-
-    print load_fiche_titre($title, '', '');
-
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
-    print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT, 1);
-    print '</td></tr>';
-
-    print $text;
-
-    print '</table>';
-    print '<br>';
-
-
-    // Other
-    print load_fiche_titre($langs->trans("Other"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>';
-
-	// Encrypt and protect PDF
-
-	print '<tr class="oddeven">';
-	print '<td>';
-	$text = $langs->trans("ProtectAndEncryptPdfFiles");
-	$desc = $form->textwithpicto($text, $langs->transnoentities("ProtectAndEncryptPdfFilesDesc"), 1);
-	print $desc;
-	print '</td>';
-	print '<td width="60">';
-	if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
-	{
-		print img_picto($langs->trans("Active"), 'tick');
-	}
-	print '</td>';
-	print '<td align="center" width="140">';
-	if (empty($conf->global->PDF_SECURITY_ENCRYPTION))
-	{
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_pdfsecurity">'.$langs->trans("Activate").'</a>';
+		$pid=$langs->transcountry("ProfId".$i, $mysoc->country_code);
+		if ($pid == '-') $pid=false;
 	}
 	else
 	{
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_pdfsecurity">'.$langs->trans("Disable").'</a>';
+		$pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 	}
-	print "</td>";
-
-	print "</td>";
-	print '</tr>';
-
-	// Hide Desc
-
-	print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC, 1);
-	print '</td></tr>';
-
-	// Hide Ref
-
-	print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF, 1);
-	print '</td></tr>';
-
-	// Hide Details
-
-	print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS, 1);
-	print '</td></tr>';
-
-	// Invert sender and recipient
-	print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_INVERT_SENDER_RECIPIENT, 1);
-	print '</td></tr>';
-
-	// Use French location
-	print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_PDF_USE_ISO_LOCATION, 1);
-	print '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td colspan="2">';
-	print $arraydetailsforpdffoot[($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS ? $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS : 0)];
-	print '</td></tr>';
-
-	print '</table>';
-	print '</div>';
-
-
-	/*
-	 *  Library
-	 */
-
-	print '<br>';
-	print load_fiche_titre($langs->trans("Library"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">'."\n";
-
-	print '<tr class="liste_titre">'."\n";
-	print '<td>'.$langs->trans("Name").'</td>'."\n";
-	print '<td>'.$langs->trans("Value").'</td>'."\n";
-	print "</tr>\n";
-
-	print '<tr class="oddeven">'."\n";
-	print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
-	print '<td>';
-	$i=0;
-	$pdf=pdf_getInstance('A4');
-	if (class_exists('FPDF') && ! class_exists('TCPDF'))
+	if ($pid)
 	{
-		if ($i) print ' + ';
-		print 'FPDF';
-		print ' ('.@constant('FPDF_PATH').')';
-		$i++;
+		print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
+		$keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
+		print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant)?$conf->global->$keyforconstant:0, 1, $noCountryCode);
+		print '</td></tr>';
 	}
-	if (class_exists('TCPDF'))
-	{
-		if ($i) print ' + ';
-		print 'TCPDF';
-		print ' ('.@constant('TCPDF_PATH').')';
-		$i++;
-	}
-	if (class_exists('FPDI'))
-	{
-		if ($i) print ' + ';
-		print 'FPDI';
-		print ' ('.@constant('FPDI_PATH').')';
-		$i++;
-	}
-	if (class_exists('TCPDI'))
-	{
-		if ($i) print ' + ';
-		print 'TCPDI';
-		print ' ('.@constant('TCPDI_PATH').')';
-		$i++;
-	}
-	print '</td>'."\n";
-	print '</tr>'."\n";
-
-	print "</table>\n";
-	print '</div>';
-
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-    print '</div>';
-	print '<br>';
 }
 
+print '</table>';
+print '</div>';
+
+
+print '<br>';
+
+
+// Localtaxes
+$locales ='';
+$text='';
+if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
+{
+	if ($mysoc->useLocalTax(1))
+	{
+		$locales = $langs->transcountry("LT1", $mysoc->country_code);
+		$text ='<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)) . '</td><td>';
+		$text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_SECOND_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX : 0, 1);
+		$text .= '</td></tr>';
+	}
+
+	if ($mysoc->useLocalTax(2))
+	{
+		$locales.=($locales?' & ':'').$langs->transcountry("LT2", $mysoc->country_code);
+
+		$text.= '<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)) . '</td><td>';
+		$text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_THIRD_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX : 0, 1);
+		$text.= '</td></tr>';
+	}
+}
+
+$title = $langs->trans("PDFRulesForSalesTax");
+if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
+{
+	$title.=' - '.$langs->trans("PDFLocaltax", $locales);
+}
+
+print load_fiche_titre($title, '', '');
+
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+// Hide any information on Sale tax / VAT
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0, 1);
+print '</td></tr>';
+
+// Locataxes
+print $text;
+
+print '</table>';
+print '<br>';
+
+
+// Other
+print load_fiche_titre($langs->trans("Other"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+//Desc
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0, 1);
+print '</td></tr>';
+
+//Ref
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0, 1);
+print '</td></tr>';
+
+//Details
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0, 1);
+print '</td></tr>';
+
+//Invert sender and recipient
+
+print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT))?$conf->global->MAIN_INVERT_SENDER_RECIPIENT:0, 1);
+print '</td></tr>';
+
+// Place customer adress to the ISO location
+
+print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
+print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0, 1);
+print '</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
+print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+/*
+ *  Library
+ */
+
+print '<br>';
+print load_fiche_titre($langs->trans("Library"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder" width="100%">'."\n";
+
+print '<tr class="liste_titre">'."\n";
+print '<td>'.$langs->trans("Name").'</td>'."\n";
+print '<td>'.$langs->trans("Value").'</td>'."\n";
+print "</tr>\n";
+
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
+print '<td>';
+$i=0;
+$pdf=pdf_getInstance('A4');
+if (class_exists('FPDF') && ! class_exists('TCPDF'))
+{
+	if ($i) print ' + ';
+	print 'FPDF';
+	print ' ('.@constant('FPDF_PATH').')';
+	$i++;
+}
+if (class_exists('TCPDF'))
+{
+	if ($i) print ' + ';
+	print 'TCPDF';
+	print ' ('.@constant('TCPDF_PATH').')';
+	$i++;
+}
+if (class_exists('FPDI'))
+{
+	if ($i) print ' + ';
+	print 'FPDI';
+	print ' ('.@constant('FPDI_PATH').')';
+	$i++;
+}
+if (class_exists('TCPDI'))
+{
+	if ($i) print ' + ';
+	print 'TCPDI';
+	print ' ('.@constant('TCPDI_PATH').')';
+	$i++;
+}
+print '</td>'."\n";
+print '</tr>'."\n";
+
+print "</table>\n";
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 28c3db6f1d3..c9bf1ba4357 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -88,7 +88,7 @@ llxHeader('', $langs->trans("Miscellaneous"), $wikihelp);
 
 print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup');
 
-print $langs->trans("MiscellaneousDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("MiscellaneousDesc")."</span><br>\n";
 print "<br>\n";
 
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index e08c2c5eca8..73cad8f69ad 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -147,7 +147,7 @@ llxHeader('', $langs->trans("Setup"), $wikihelp);
 
 print load_fiche_titre($langs->trans("SmsSetup"), '', 'title_setup');
 
-print $langs->trans("SmsDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("SmsDesc")."</span><br>\n";
 print "<br>\n";
 
 // List of sending methods
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index ad7a2278991..ba2dde77bec 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -229,7 +229,7 @@ print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_
 
 $current_language_code=$langs->defaultlang;
 $s=picto_from_langcode($current_language_code);
-print $form->textwithpicto($langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong>', $langs->trans("TranslationDesc")).'<br>';
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong>', $langs->trans("TranslationDesc")).'</span><br>';
 
 print '<br>';
 
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 3835baf3b25..44370b40720 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -953,6 +953,7 @@ class BOM extends CommonObject
 	public function initAsSpecimen()
 	{
 	    $this->initAsSpecimenCommon();
+	    $this->ref = 'BOM-123';
 	    $this->date = $this->date_creation;
 	}
 
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index b574efc81df..b7eb1608e9e 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -100,14 +100,15 @@ if ($nolinesbefore) {
 		$filtertype='';
 		if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
 
+		$statustoshow = -1;
 		if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
 		{
 			// hide products in closed warehouse, but show products for internal transfer
-			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
+			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
 		}
 		else
 		{
-			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
+			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 		}
 
 		echo '</span>';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 09d3351fb4d..baaed787023 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3584,7 +3584,7 @@ class Facture extends CommonInvoice
 	 *  @param    	int		$offset			For pagination
 	 *  @param    	string	$sortfield		Sort criteria
 	 *  @param    	string	$sortorder		Sort order
-	 *  @return     int             		-1 if KO, array with result if OK
+	 *  @return     array|int             	-1 if KO, array with result if OK
 	 */
     public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC')
 	{
@@ -3655,7 +3655,7 @@ class Facture extends CommonInvoice
 	 *	(Status validated or abandonned for a reason 'other') + not payed + no payment at all + not already replaced
 	 *
 	 *	@param		int		$socid		Id thirdparty
-	 *	@return    	array				Array of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
+	 *	@return    	array|int			Array of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 */
     public function list_replacable_invoices($socid = 0)
 	{
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index cab7f36a5a7..3e9011bb74b 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -222,7 +222,17 @@ $sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre as tit
 $sql.= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when, f.suspended,";
 $sql.= " f.datec, f.tms,";
 $sql.= " f.fk_cond_reglement, f.fk_mode_reglement";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label']))
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql.=preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql =preg_replace('/,\s*$/', '', $sql);
+
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as f";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_rec_extrafields as ef ON ef.fk_object = f.rowid";
 if (! $user->rights->societe->client->voir && ! $socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
@@ -473,6 +483,8 @@ if ($resql)
 	if (! empty($arrayfields['f.date_when']['checked']))     print_liste_field_titre($arrayfields['f.date_when']['label'], $_SERVER['PHP_SELF'], "f.date_when", "", $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.datec']['checked']))         print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER['PHP_SELF'], "f.datec", "", $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.tms']['checked']))           print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER['PHP_SELF'], "f.tms", "", $param, 'align="center"', $sortfield, $sortorder);
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	if (! empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'nomaxwidthsearch ')."\n";
 	print "</tr>\n";
@@ -611,6 +623,15 @@ if ($resql)
 			   print '</td>';
 			   if (! $i) $totalarray['nbfield']++;
 			}
+
+			$obj = $objp;
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Status
 			if (! empty($arrayfields['status']['checked']))
 			{
 			   print '<td align="center">';
diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php
index 9740de82fbc..03c0f0ab7ae 100644
--- a/htdocs/core/boxes/box_accountancy_suspense_account.php
+++ b/htdocs/core/boxes/box_accountancy_suspense_account.php
@@ -108,14 +108,14 @@ class box_accountancy_suspense_account extends ModeleBoxes
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-					'td' => 'class="nohover opacitymedium left"',
-					'text' => $langs->trans("SuspenseAccountNotDefined")
+					'td' => 'class="nohover"',
+					'text' => '<span class="opacitymedium">'.$langs->trans("SuspenseAccountNotDefined").'</span>'
 				);
 			}
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+                'td' => 'class="nohover"',
+            	'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
             );
         }
     }
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 494950927a9..3c4ba1c9736 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2015-2019 Frederic France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -82,6 +82,8 @@ class box_factures_imp extends ModeleBoxes
         $facturestatic = new Facture($this->db);
         $societestatic = new Societe($this->db);
 
+		$langs->load("bills");
+
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $max));
 
 		if ($user->rights->facture->lire)
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 74253a19f51..84f49bafe3f 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -316,7 +316,7 @@ abstract class CommonDocGenerator
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
-     * Define array with couple subtitution key => subtitution value
+     * Define array with couple substitution key => substitution value
      *
      * @param   Translate	$outputlangs    Language object for output
      * @return	array						Array of substitution key->code
@@ -445,7 +445,7 @@ abstract class CommonDocGenerator
 		$array_key.'_already_payed_all_locale'=>price(price2num($already_payed_all, 'MT'), 0, $outputlangs),
 		$array_key.'_already_payed_all'=> price2num($already_payed_all, 'MT'),
 
-		// Remain to pay with all know infrmation (except open direct debit requests)
+		// Remain to pay with all know information (except open direct debit requests)
 		$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $remain_to_pay, 'MT'), 0, $outputlangs),
 		$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $remain_to_pay, 'MT')
 		);
@@ -479,7 +479,7 @@ abstract class CommonDocGenerator
 			$totalUp = 0;
 			foreach ($object->lines as $line)
 			{
-			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
+			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
 				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
@@ -868,7 +868,7 @@ abstract class CommonDocGenerator
 
 
     /**
-     *  uasort callback function to Sort colums fields
+     *  uasort callback function to Sort columns fields
      *
      *  @param	array			$a    			PDF lines array fields configs
      *  @param	array			$b    			PDF lines array fields configs
@@ -907,7 +907,7 @@ abstract class CommonDocGenerator
         // Positionning
         $curX = $this->page_largeur-$this->marge_droite; // start from right
 
-        // Array witdh
+        // Array width
         $arrayWidth = $this->page_largeur-$this->marge_droite-$this->marge_gauche;
 
         // Count flexible column
@@ -915,10 +915,10 @@ abstract class CommonDocGenerator
         $countFlexCol = 0;
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if(!$this->getColumnStatus($colKey)) continue; // continue if desable
+            if(!$this->getColumnStatus($colKey)) continue; // continue if disabled
 
             if(!empty($colDef['scale'])){
-                // In case of column widht is defined by percentage
+                // In case of column width is defined by percentage
                 $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
             }
 
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 53e85adcec1..a70605612fe 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -334,7 +334,8 @@ class Link extends CommonObject
             if($this->db->num_rows($resql) > 0)
             {
                 $obj = $this->db->fetch_object($resql);
-	            $this->id=$obj->rowid;
+
+                $this->id = $obj->rowid;
                 $this->entity = $obj->entity;
                 $this->datea = $this->db->jdate($obj->datea);
                 $this->url = $obj->url;
@@ -361,8 +362,6 @@ class Link extends CommonObject
      */
     public function delete($user)
     {
-        global $langs, $conf;
-
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $error = 0;
 
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 637aac02545..2347d3d77e5 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -199,6 +199,12 @@ class DoliDBPgsql extends DoliDB
                     $line=$newline;
     			}
 
+    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+bigint.*auto_increment/i', $line, $reg)) {
+    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 BIGSERIAL PRIMARY KEY', $line);
+    				//$line = "-- ".$line." replaced by --\n".$newline;
+    				$line=$newline;
+    			}
+
     			// tinyint type conversion
     			$line=preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
     			$line=preg_replace('/tinyint/i', 'smallint', $line);
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 07eecf0f352..c81ea9d98d7 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -282,8 +282,11 @@ if (! function_exists('dol_loginfunction'))
 
 		// Set jquery theme
 		$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico', 1);
+
+		$favicon = DOL_URL_ROOT.'/theme/common/dolibarr_logo_256x256.png';
+		if (! empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+
 		$jquerytheme = 'base';
 		if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
 
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index ef875675ed7..66698be76cc 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -348,23 +348,21 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 	else
 	{
-		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
+		$dirthemestring = '';
+		foreach($dirthemes as $dirtheme)
+		{
+			$dirthemestring .= '"'.$dirtheme.'" ';
+		}
+
+		print '<tr class="liste_titre"><th class="titlefield">';
+		print $form->textwithpicto($langs->trans("DefaultSkin"), $langs->trans("ThemeDir").' : '.$dirthemestring);
+		print '</th>';
 		print '<th class="right">';
 		$url='https://www.dolistore.com/4-skins';
 		print '<a href="'.$url.'" target="_blank">';
 		print $langs->trans('DownloadMoreSkins');
 		print '</a>';
 		print '</th></tr>';
-
-		print '<tr>';
-		print '<td>'.$langs->trans("ThemeDir").'</td>';
-		print '<td>';
-		foreach($dirthemes as $dirtheme)
-		{
-			echo '"'.$dirtheme.'" ';
-		}
-		print '</td>';
-		print '</tr>';
 	}
 
 	print '<tr><td colspan="'.$colspan.'">';
@@ -399,7 +397,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1)?'&optioncss='.GETPOST('optioncss', 'alpha', 1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
 						if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
 						else $title=$langs->trans("ShowPreview");
-						print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+						print '<img class="shadow" src="'.$url.'" alt="'.$title.'" title="'.$title.'" style="width: 80px; height: 60px; border: none; margin-bottom: 5px;">';
 						print '</a><br>';
 						if ($subdir == $selected_theme)
 						{
@@ -422,6 +420,31 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 	print '</td></tr>';
 
+	// Show logo
+	if ($foruserprofile)
+	{
+		// Nothing
+	}
+	else
+	{
+		// Show logo
+		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
+		if ($edit)
+		{
+			print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
+		}
+		else
+		{
+			print  yn($conf->global->MAIN_SHOW_LOGO);
+		}
+		print '</td>';
+		print '</tr>';
+		/*
+		print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
+		print "</tr>";*/
+	}
+
+
 	// TopMenuDisableImages
 	if ($foruserprofile)
 	{
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 66f4dac2a44..39e2150280e 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -39,10 +39,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  */
 function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = 0, $mode = '')
 {
-	global $user,$conf,$langs,$dolibarr_main_db_name;
+	global $user,$conf,$langs,$mysoc;
+	global $dolibarr_main_db_name;
 
-	$mainmenu=$_SESSION["mainmenu"];
-	$leftmenu=$_SESSION["leftmenu"];
+	$mainmenu=(empty($_SESSION["mainmenu"])?'':$_SESSION["mainmenu"]);
+	$leftmenu=(empty($_SESSION["leftmenu"])?'':$_SESSION["leftmenu"]);
 
 	$id='mainmenu';
 	$listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
@@ -53,17 +54,17 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 	if (empty($noout)) print_start_menu_array_auguria();
 
-    global $usemenuhider;
-    $usemenuhider = 1;
+	global $usemenuhider;
+	$usemenuhider = 1;
 
-	// Show/Hide vertical menu
-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+    // Show/Hide vertical menu. The hamburger icon for .menuhider action.
+    if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
 	    $showmode=1;
 	    $classname = 'class="tmenu menuhider"';
 	    $idsel='menu';
 
-	    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+	    $menu->add('#', (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$num = count($newTabMenu);
@@ -125,20 +126,44 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	$menu->liste = dol_sort_array($menu->liste, 'position');
 
 	// Output menu entries
-	foreach($menu->liste as $menkey => $menuval)
+	// Show logo company
+	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-        if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-	    if (empty($noout)) print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
-	    if (empty($noout)) print_end_menu_entry_auguria($menuval['enabled']);
+		//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
+		$mysoc->logo_squarred_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
+		if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
+		{
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
+		}
+		else
+		{
+			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo_squarred.png';
+		}
+		$title=$langs->trans("GoIntoSetupToChangeLogo");
+
+		print "\n".'<!-- Show logo on menu -->'."\n";
+		print_start_menu_entry_auguria('companylogo', 'class="tmenu tmenucompanylogo"', 1);
+
+		print '<div class="center backgroundforcompanylogo"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px"></div>'."\n";
+
+		print_end_menu_entry_auguria(4);
+	}
+
+	if (empty($noout)) {
+		foreach($menu->liste as $menuval)
+		{
+			print_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+	    	print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
+		    print_end_menu_entry_auguria($menuval['enabled']);
+		}
 	}
 
 	$showmode=1;
-	if (empty($noout)) print_start_menu_entry_auguria('', 'class="tmenuend"', $showmode);
-	if (empty($noout)) print_end_menu_entry_auguria($showmode);
-
-	if (empty($noout)) print_end_menu_array_auguria();
-
-	print "\n";
+	if (empty($noout)) {
+		print_start_menu_entry_auguria('', 'class="tmenuend"', $showmode);
+		print_end_menu_entry_auguria($showmode);
+		print_end_menu_array_auguria();
+	}
 
 	return 0;
 }
@@ -193,16 +218,16 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
 
 	if ($showmode == 1)
 	{
-		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
+		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').' title="'.dol_escape_htmltag($text).'">';
 		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
-		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
+		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').' title="'.dol_escape_htmltag($text).'">';
 		print '<span class="mainmenuaspan">';
 		print $text;
 		print '</span>';
 		print '</a>';
 	}
-	if ($showmode == 2)
+	elseif ($showmode == 2)
 	{
 		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
@@ -244,17 +269,18 @@ function print_end_menu_array_auguria()
 
 /**
  * Core function to output left menu auguria
+ * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
  *
  * @param	DoliDB		$db                 Database handler
- * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler
- * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler
+ * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
+ * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
  * @param  	array		$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
- * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all)
+ * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
- * @return	int								Nb of entries
+ * @return	int								Nb of menu entries
  */
 function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)
 {
@@ -268,35 +294,6 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	global $usemenuhider;
 	$usemenuhider = 0;
 
-	// Show logo company
-	if (empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
-		$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
-		$mysoc->logo_squarred_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
-		if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
-		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-		}
-		elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
-		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
-		}
-		else
-		{
-			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo_squarred.png';
-		}
-		$title=$langs->trans("GoIntoSetupToChangeLogo");
-		print "\n".'<!-- Show logo on menu -->'."\n";
-		print '<div class="blockvmenuimpair blockvmenulogo">'."\n";
-		print '<div class="menu_titre" id="menu_titre_logo"></div>';
-		print '<div class="menu_top" id="menu_top_logo"></div>';
-		print '<div class="menu_contenu" id="menu_contenu_logo">';
-		print '<div class="center"><img title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";
-		print '</div>';
-		print '<div class="menu_end" id="menu_end_logo"></div>';
-		print '</div>'."\n";
-	}
-
 	if (is_array($moredata) && ! empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
 	{
         print "\n";
@@ -355,9 +352,9 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		$db->free($resql);
 	}
 
-	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
+	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
 	{
-		$newmenu->add('', $langs->trans("Journalization"), 0, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy');
+		$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy');
 
 		// Multi journal
 		$sql = "SELECT rowid, code, label, nature";
@@ -390,7 +387,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					if ($objp->nature == 9) $nature="hasnew";
 
 					// To enable when page exists
-					if (! empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
+					if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
 					{
 						if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature='';
 					}
@@ -399,7 +396,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					{
                         $langs->load('accountancy');
                         $journallabel=$langs->transnoentities($objp->label);	// Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
-                        if (empty($leftmenu) || preg_match('/accountancy/', $leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
+                        $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
 					}
 					$i++;
 				}
@@ -444,7 +441,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		*/
 	}
 
-	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
+	if (! empty($conf->ftp->enabled) && $mainmenu == 'ftp')	// Entry for FTP
 	{
 		$MAXFTP=20;
 		$i=1;
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index c4622f2d6ee..b3c5814240c 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -111,15 +111,18 @@ class MenuManager
     	$tabMenu=array();
     	$menuArbo = new Menubase($this->db, 'auguria');
     	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
-
     	$this->tabMenu=$tabMenu;
-    }
+    	//var_dump($tabMenu);
+    	
+    	//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+   	}
 
 
     /**
      *  Show menu
+     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
      *
-     *	@param	string	$mode		    'top', 'left', 'jmobile' (used to get full xml ul/li menu)
+     *	@param	string	$mode		    'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
@@ -138,9 +141,18 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
         $this->menu=new Menu();
 
-        if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-        if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-
+        if (empty($conf->global->MAIN_MENU_INVERT))
+        {
+        	if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+        	if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+        }
+        else
+        {
+        	$conf->global->MAIN_SHOW_LOGO=0;
+        	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
+        	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+        }
+        
 		if ($mode == 'topnb')
 		{
 		    print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
@@ -315,5 +327,8 @@ class MenuManager
         }
 
         unset($this->menu);
+        
+        //print 'xx'.$mode;
+        return 0;
     }
 }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index dbf56429086..5d6bf501d82 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -478,16 +478,22 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-		$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
+		//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
 		$mysoc->logo_squarred_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
+
+		$logoContainerAdditionalClass = 'backgroundforcompanylogo';
+		if(!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND)){
+			$logoContainerAdditionalClass = '';
+		}
+
 		if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
 		{
 			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		}
-		elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
+		/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 		{
 			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
-		}
+		}*/
 		else
 		{
 			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo_squarred.png';
@@ -497,7 +503,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		print "\n".'<!-- Show logo on menu -->'."\n";
 		print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo"', 1);
 
-		print '<div class="center backgroundforcompanylogo"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px"></div>'."\n";
+
+		print '<div class="center '.$logoContainerAdditionalClass.' menulogocontainer"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px"></div>'."\n";
 
 		print_end_menu_entry(4);
 	}
@@ -629,7 +636,7 @@ function print_end_menu_array()
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
  * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
- * @return	int								nb of menu entries
+ * @return	int								Nb of menu entries
  */
 function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)
 {
@@ -702,8 +709,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 				}
 				$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1);
-				$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);
 				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1);
+				$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);
 
 				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
 				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index d8a47d45c68..8389db029be 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -64,6 +64,8 @@ class MenuManager
      */
     public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
     {
+    	global $conf, $user, $langs;
+    	
 		// On sauve en session le menu principal choisi
 		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
 		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
@@ -117,7 +119,7 @@ class MenuManager
 
     /**
      *  Show menu.
-     *  Module defined in sql tables were stored into $this->tabMenu BEFORE this is called.
+     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
      *
      *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
      *  @param	array	$moredata		An array with more data to output
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index c678f0380fd..3049214679e 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -198,13 +198,9 @@ class pdf_cyan extends ModelePDFPropales
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		$outputlangs->load("main");
-		$outputlangs->load("dict");
-		$outputlangs->load("companies");
-		$outputlangs->load("bills");
-		$outputlangs->load("propal");
-		$outputlangs->load("products");
+		
+		// Translations
+		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
 
 		$nblines = count($object->lines);
 
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 5a7d22670c7..8abcc41c263 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -177,7 +177,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 *  Validate a password
 	 *
 	 *  @param      string  $password   Password to check
-	 *  @return     int                 0 if KO, >0 if OK
+	 *  @return     bool                false if KO, true if OK
 	 */
 	public function validatePassword($password)
 	{
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 7f860586909..f8c80c3a0c8 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -38,7 +38,6 @@ if (empty($object) || ! is_object($object)) {
     exit;
 }
 
-
 $usemargins=0;
 if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element, array('facture','facturerec','propal','commande')))
 {
@@ -248,14 +247,15 @@ if ($nolinesbefore) {
 
 		if (empty($senderissupplier))
 		{
+			$statustoshow = 1;
 			if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
 			{
 				// hide products in closed warehouse, but show products for internal transfer
-				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, -1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
+				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
 			}
 			else
 			{
-				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, -1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, '', GETPOST('combinations', 'array'));
+				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, '', GETPOST('combinations', 'array'));
 			}
 
 			if (! empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index db84d3f9fd0..3cb5db2c013 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -333,9 +333,9 @@ class TraceableDB extends DoliDB
 			'sql'           => $sql,
 			'duration'      => $duration,
 			'memory_usage'  => $memoryDelta,
-			'is_success'    => $resql,
-			'error_code'    => ! $resql ? $this->db->lasterrno() : null,
-			'error_message' => ! $resql ? $this->db->lasterror() : null
+			'is_success'    => $resql ? true : false,
+			'error_code'    => $resql ? null : $this->db->lasterrno(),
+			'error_message' => $resql ? null : $this->db->lasterror()
 		);
 	}
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index daadfa913ec..7b8138f1f3a 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -279,7 +279,7 @@ $sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.tota
 $sql.= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve, d.note_private, d.note_public,";
 $sql.= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.email, u.statut, u.photo";
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attributes['expensereport']['type'] as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 4536cdc5bbd..56ad1f9481f 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -684,7 +684,7 @@ class CommandeFournisseur extends CommonOrder
             $billedtext = ' - '.$langs->trans("Billed");
         }
 
-        $statusLong = $langs->trans($this->statuts_long[$status]).$billedtext;
+        $statusLong = $langs->trans($this->statuts[$status]).$billedtext;
         $statusShort = $langs->trans($this->statutshort[$status]);
 
         return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 1948ce28a57..a857898f5dc 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -76,6 +76,8 @@ ALTER TABLE llx_holiday_extrafields ADD INDEX idx_holiday_extrafields (fk_object
 
 ALTER TABLE llx_societe_rib MODIFY label varchar(200);
 
+ALTER TABLE llx_societe ADD COLUMN logo_squarred varchar(255);
+
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300);
 
 create table llx_entrepot_extrafields
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 4db88defc68..f312015a662 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -107,6 +107,7 @@ create table llx_societe
   supplier_order_min_amount	       double(24,8)   DEFAULT NULL,			-- min amount for supplier orders
   default_lang             varchar(6),									-- default language
   logo                     varchar(255)   DEFAULT NULL,
+  logo_squarred            varchar(255)   DEFAULT NULL,
   canvas				   varchar(32)    DEFAULT NULL,	                -- type of canvas if used (null by default)
   fk_entrepot 			   integer DEFAULT 0,							-- if we need a link between third party and warehouse
   webservices_url          varchar(255),                            	-- supplier webservice url
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index afce2e4fa34..0546b472225 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -875,9 +875,9 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
@@ -1070,6 +1070,9 @@ CompanyCountry=Country
 CompanyCurrency=Main currency
 CompanyObject=Object of the company
 Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
@@ -1115,7 +1118,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
+CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index aa778a111bc..b7bef1aa46a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1195,7 +1195,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
  */
 function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disablejmobile = 0, $disablenofollow = 0)
 {
-	global $db, $conf, $langs, $user, $hookmanager;
+	global $db, $conf, $langs, $user, $mysoc, $hookmanager;
 
 	top_httphead();
 
@@ -1224,15 +1224,17 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
 		// Favicon
-		$favicon = dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico', 1);
+		$favicon = DOL_URL_ROOT.'/theme/common/dolibarr_logo_256x256.png';
+		if (! empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
 		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="https://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
         // Mobile appli like icon
-        $manifest = DOL_MAIN_URL_ROOT . '/theme/'.$conf->theme.'/manifest.json.php';
+        $manifest = DOL_URL_ROOT . '/theme/'.$conf->theme.'/manifest.json.php';
         if(!empty($manifest)){
             print '<link rel="manifest" href="'.$manifest.'" />'."\n";
         }
@@ -1614,9 +1616,6 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		print '<div class="login_block usedropdown">'."\n";
 
 
-
-
-
 		// Add login user link
 		$toprightmenu.='<div class="login_block_user">';
 
@@ -1624,17 +1623,17 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		$mode=-1;
 		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
 
-        if(!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)){
+        if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)){
             // Add search dropdown
             $toprightmenu.= top_menu_search($user, $langs);
         }
 
-        if(!empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) {
+        if (!empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) {
             // Add bookmark dropdown
             $toprightmenu .= top_menu_bookmark($user, $langs);
         }
 
-        // add user dropdown
+        // Add user dropdown
 	    $toprightmenu.= top_menu_user($user, $langs);
 
 		$toprightmenu.='</div></div>';
@@ -1967,10 +1966,10 @@ function top_menu_bookmark(User $user, Translate $langs)
                   if( e.which === 77 && e.ctrlKey && e.shiftKey ){
                      console.log(\'control + shift + m : trigger open bookmark dropdown\');
                      openBookMarkDropDown();
-                  }      
+                  }
             });
-            
-                     
+
+
             var openBookMarkDropDown = function() {
                 event.preventDefault();
                 $("#topmenu-bookmark-dropdown").toggleClass("open");
@@ -2054,26 +2053,26 @@ function top_menu_search(User $user, Translate $langs)
     <!-- Code to show/hide the user drop-down -->
     <script>
     $( document ).ready(function() {
-        
+
         // prevent submiting form on press ENTER
         $("#top-global-search-input").keydown(function (e) {
             if (e.keyCode == 13) {
                 var inputs = $(this).parents("form").eq(0).find(":button");
-                if (inputs[inputs.index(this) + 1] != null) {                    
+                if (inputs[inputs.index(this) + 1] != null) {
                     inputs[inputs.index(this) + 1].focus();
                 }
                 e.preventDefault();
                 return false;
             }
         });
-        
-        
+
+
         // submit form action
         $(".dropdown-global-search-button-list .global-search-item").on("click", function(event) {
             $("#top-menu-action-bookmark").attr("action", $(this).data("target"));
             $("#top-menu-action-bookmark").submit();
         });
-        
+
         // close drop down
         $(document).on("click", function(event) {
             if (!$(event.target).closest("#topmenu-global-search-dropdown").length) {
@@ -2092,10 +2091,10 @@ function top_menu_search(User $user, Translate $langs)
               if( e.which === 70 && e.ctrlKey && e.shiftKey ){
                  console.log(\'control + shift + f : trigger open global-search dropdown\');
                  openGlobalSearchDropDown();
-              }      
+              }
         });
-        
-                 
+
+
         var openGlobalSearchDropDown = function() {
             event.preventDefault();
             $("#topmenu-global-search-dropdown").toggleClass("open");
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ef144c10e0d..22a8af0d270 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -17,6 +17,7 @@
  * Copyright (C) 2016		Meziane Sof		     <virtualsof@yahoo.fr>
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
  * Copyright (C) 2019       Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2019       Thibault FOUCART     <support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -297,16 +298,18 @@ if (empty($reshook))
             $object->duration_unit      	 = $duration_unit;
             $object->fk_default_warehouse	 = GETPOST('fk_default_warehouse');
             $object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0;
-            $object->desiredstock            = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
+            $object->desiredstock          = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
             $object->canvas             	 = GETPOST('canvas');
+            $object->net_measure           = GETPOST('net_measure');
+            $object->net_measure_units     = GETPOST('net_measure_units');		// This is not the fk_unit but the power of unit
             $object->weight             	 = GETPOST('weight');
             $object->weight_units       	 = GETPOST('weight_units');		// This is not the fk_unit but the power of unit
             $object->length             	 = GETPOST('size');
             $object->length_units       	 = GETPOST('size_units');		// This is not the fk_unit but the power of unit
             $object->width               	 = GETPOST('sizewidth');
             $object->height             	 = GETPOST('sizeheight');
-	        $object->surface            	 = GETPOST('surface');
-	        $object->surface_units      	 = GETPOST('surface_units');	// This is not the fk_unit but the power of unit
+            $object->surface            	 = GETPOST('surface');
+            $object->surface_units      	 = GETPOST('surface_units');	// This is not the fk_unit but the power of unit
             $object->volume             	 = GETPOST('volume');
             $object->volume_units       	 = GETPOST('volume_units');		// This is not the fk_unit but the power of unit
             $object->finished           	 = GETPOST('finished', 'alpha');
@@ -403,6 +406,8 @@ if (empty($reshook))
                 $object->duration_unit          = GETPOST('duration_unit', 'alpha');
 
                 $object->canvas                 = GETPOST('canvas');
+                $object->net_measure            = GETPOST('net_measure');
+                $object->net_measure_units      = GETPOST('net_measure_units');	// This is not the fk_unit but the power of unit
                 $object->weight                 = GETPOST('weight');
                 $object->weight_units           = GETPOST('weight_units');	// This is not the fk_unit but the power of unit
                 $object->length                 = GETPOST('size');
@@ -1053,13 +1058,20 @@ else
             $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
             print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
             print '</td></tr>';
+            
+            // Net Measure
+            print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
+            print '<input name="net_measure" size="4" value="'.GETPOST('net_measure').'">';
+            print $formproduct->selectMeasuringUnits("net_measure_units", "net_measure", GETPOSTISSET('net_measure_units')?GETPOST('net_measure_units', 'alpha'):(empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?0:$conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
+            print '</td></tr>';
 
-            // Weight
+            // Brut Weight
             print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
             print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
             print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units')?GETPOST('weight_units', 'alpha'):(empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?0:$conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
             print '</td></tr>';
-            // Length
+            
+            // Brut Length
             if (empty($conf->global->PRODUCT_DISABLE_SIZE))
             {
                 print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
@@ -1071,7 +1083,7 @@ else
             }
             if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
             {
-                // Surface
+                // Brut Surface
                 print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
                 print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
                 print $formproduct->selectMeasuringUnits("surface_units", "surface", GETPOSTISSET('surface_units')?GETPOST('surface_units', 'alpha'):'0', 0, 2);
@@ -1079,7 +1091,7 @@ else
             }
             if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
             {
-                // Volume
+                // Brut Volume
                 print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
                 print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
                 print $formproduct->selectMeasuringUnits("volume_units", "volume", GETPOSTISSET('volume_units')?GETPOST('volume_units', 'alpha'):'0', 0, 2);
@@ -1426,15 +1438,22 @@ else
                 $statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
                 print $form->selectarray('finished', $statutarray, $object->finished);
                 print '</td></tr>';
+                
+                // Net Measure
+                print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
+                print '<input name="net_measure" size="5" value="'.$object->net_measure.'"> ';
+                print $form->selectUnits($object->net_measure_units, 'units');
+                //print $formproduct->selectMeasuringUnits("net_measure_units", "weight", $object->net_measure_units, 0, 2);
+                print '</td></tr>';
 
-                // Weight
+                // Brut Weight
                 print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
                 print '<input name="weight" size="5" value="'.$object->weight.'"> ';
                 print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
                 print '</td></tr>';
                 if (empty($conf->global->PRODUCT_DISABLE_SIZE))
                 {
-                  // Length
+                  // Brut Length
                   print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
                   print '<input name="size" size="5" value="'.$object->length.'">x';
                   print '<input name="sizewidth" size="5" value="'.$object->width.'">x';
@@ -1444,7 +1463,7 @@ else
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
                 {
-                    // Surface
+                    // Brut Surface
                     print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
                     print '<input name="surface" size="5" value="'.$object->surface.'"> ';
                     print $formproduct->selectMeasuringUnits("surface_units", "surface", $object->surface_units, 0, 2);
@@ -1452,7 +1471,7 @@ else
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
                 {
-                    // Volume
+                    // Brut Volume
                     print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
                     print '<input name="volume" size="5" value="'.$object->volume.'"> ';
                     print $formproduct->selectMeasuringUnits("volume_units", "volume", $object->volume_units, 0, 2);
@@ -1833,8 +1852,19 @@ else
                 print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
                 print $object->getLibFinished();
                 print '</td></tr>';
+                
+                // Net Measure
+                print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td colspan="2">';
+                if ($object->net_measure != '')
+                {
+                	print $object->net_measure." ".measuring_units_string(0, "weight", $object->net_measure_units);
+                }
+                else
+                {
+                    print '&nbsp;';
+                }
 
-                // Weight
+                // Brut Weight
                 print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
                 if ($object->weight != '')
                 {
@@ -1847,7 +1877,7 @@ else
                 print "</td></tr>\n";
                 if (empty($conf->global->PRODUCT_DISABLE_SIZE))
                 {
-                    // Length
+                    // Brut Length
                     print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';
                     if ($object->length != '' || $object->width != '' || $object->height != '')
                     {
@@ -1864,7 +1894,7 @@ else
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
                 {
-                    // Surface
+                    // Brut Surface
                     print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
                     if ($object->surface != '')
                     {
@@ -1878,7 +1908,7 @@ else
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
                 {
-                    // Volume
+                    // Brut Volume
                     print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
                     if ($object->volume != '')
                     {
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 71befc802ae..7d887b04fbf 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -27,7 +27,6 @@ if (empty($usedolheader))
 	<head>
 	<meta name="robots" content="noindex,nofollow" />
 	<meta name="author" content="Dolibarr Development Team">
-	<link rel="shortcut icon" type="image/x-icon" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/img/favicon.ico"/>
 	<title>Test page</title>
 	<!-- Includes for JQuery (Ajax library) -->
 	<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/css/base/jquery-ui.css" />
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index c4c702bc73b..2b4ae2bb7a0 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -465,6 +465,9 @@ class Societe extends CommonObject
 	public $logo;
 	public $logo_small;
 	public $logo_mini;
+	public $logo_squarred;
+	public $logo_squarred_small;
+	public $logo_squarred_mini;
 
 	public $array_options;
 
@@ -1072,6 +1075,7 @@ class Societe extends CommonObject
 			$sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
 			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
 			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
+			$sql .= ",logo_squarred = ".(! empty($this->logo_squarred)?"'".$this->db->escape($this->logo_squarred)."'":"null");
 			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
 			$sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
 			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
@@ -1266,7 +1270,7 @@ class Societe extends CommonObject
 		$sql .= ', s.webservices_url, s.webservices_key';
 		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
 		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
-		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
+		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo, s.logo_squarred';
 		$sql .= ', s.fk_shipping_method';
 		$sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
 		$sql .= ', s.order_min_amount, s.supplier_order_min_amount';
@@ -1420,6 +1424,7 @@ class Societe extends CommonObject
 				$this->modelpdf = $obj->model_pdf;
 				$this->default_lang = $obj->default_lang;
 				$this->logo = $obj->logo;
+				$this->logo_squarred = $obj->logo_squarred;
 
 				$this->webservices_url = $obj->webservices_url;
 				$this->webservices_key = $obj->webservices_key;
@@ -2110,6 +2115,12 @@ class Societe extends CommonObject
 			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label.= '</div><div style="clear: both;"></div>';
 		}
+		elseif (! empty($this->logo_squarred) && class_exists('Form'))
+		{
+			/*$label.= '<div class="photointooltip">';
+			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+			$label.= '</div><div style="clear: both;"></div>';*/
+		}
 
 		$label.= '<div class="centpercent">';
 
@@ -3522,6 +3533,9 @@ class Societe extends CommonObject
 		$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
 		$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
 		$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+		$this->logo_squarred=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED;
+		$this->logo_squarred_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL;
+		$this->logo_squarred_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI;
 
 		// Define if company use vat or not
 		$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 69865d7ab1b..ddbea5cd43b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -794,7 +794,7 @@ table[summary="list_of_modules"] .fa-cog {
 .hideobject { display: none; }
 .minwidth50  { min-width: 50px; }
 /* rule for not too small screen only */
-@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
+@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
 {
 	.width25  { width: 25px; }
     .width50  { width: 50px; }
@@ -902,6 +902,17 @@ table[summary="list_of_modules"] .fa-cog {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize+3).'px' : $fontsize; ?> !important;
 	}
 
+	div#login_left, div#login_right {
+		min-width: 150px !important;
+		max-width: 200px !important;
+		padding-left: 5px !important;
+		padding-right: 5px !important;
+	}
+
+	div.login_block {
+		height: 64px !important;
+	}
+
 	.divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; }
 
     .tdoverflowonsmartphone {
@@ -923,11 +934,14 @@ table[summary="list_of_modules"] .fa-cog {
 		padding-bottom: 5px;
 	}
 
+	.login_table .tdinputlogin {
+		min-width: unset !important;
+	}
 	input, input[type=text], input[type=password], select, textarea     {
 		min-width: 20px;
     }
     .trinputlogin input[type=text], input[type=password] {
-		max-width: 180px;
+		max-width: 140px;
 	}
     .vmenu .searchform input {
 		max-width: 138px;	/* length of input text in the quick search box when using a smartphone and without dolidroid */
@@ -1085,19 +1099,21 @@ div.blockvmenulogo
 {
 	border-bottom: 0 !important;
 }
-.backgroundforcompanylogo {
+.menulogocontainer {
     margin: <?php echo $disableimages?'0':'6'; ?>px;
     margin-left: 8px;
     margin-right: 8px;
-    background-color: rgba(255,255,255,0.7);
     padding: 0;
-    border-radius: 5px;
     height: <?php echo $disableimages?'20':'32'; ?>px;
     /* width: 100px; */
     max-width: 100px;
     vertical-align: middle;
 }
-.backgroundforcompanylogo img.mycompany {
+.backgroundforcompanylogo {
+    background-color: rgba(255,255,255,0.7);
+    border-radius: 4px;
+}
+.menulogocontainer img.mycompany {
     object-fit: contain;
     width: inherit;
     height: inherit;
@@ -1152,7 +1168,7 @@ div.vmenu, td.vmenu {
 .menuhider { display: none !important; }
 
 /* rule to reduce top menu - 3rd reduction: The menu for user is on left */
-@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
+@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 body.sidebar-collapse .side-nav {
 	display: none;
@@ -2942,7 +2958,9 @@ td.evenodd, tr.nohoverpair td, #trlinefordates td {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 .trforbreak td {
-	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important;
+	font-weight: bold;
+    border-bottom: 1pt solid black !important;
+	/* background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important; */
 }
 
 table.dataTable td {
@@ -5743,7 +5761,7 @@ div.tabsElem a.tab {
 	}
 }
 /* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */
-@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px)	/* reduction 2 */
+@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px)	/* reduction 2 */
 {
 	li.tmenucompanylogo {
 		display: none;
@@ -5770,7 +5788,7 @@ div.tabsElem a.tab {
 	}
 }
 /* rule to reduce top menu - 3rd reduction: The menu for user is on left */
-@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
+@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 	.side-nav {
 		z-index: 200;
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index 72465fea2a3..8809286ed1e 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -25,14 +25,14 @@
  *		\brief      File for The Web App
  */
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
+if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
+if (! defined('NOREQUIREDB'))     define('NOREQUIREDB', '1');
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
+if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN','1');
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (! defined('NOLOGIN'))         define('NOLOGIN', 1);          // File must be accessed by logon page so without login
-//if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
+if (! defined('NOLOGIN'))         define('NOLOGIN', 1);
+if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
@@ -46,7 +46,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_AP
     "name": "<?php echo $appli; ?>",
     "icons": [
         {
-            "src": "<?php echo dol_buildpath('/theme/common/dolibarr_logo_256x256.png', 2); ?>",
+            "src": "<?php echo DOL_URL_ROOT.'/theme/common/dolibarr_logo_256x256.png'; ?>",
             "sizes": "256x256",
             "type": "image/png"
         }
diff --git a/htdocs/theme/eldy/thumb.png b/htdocs/theme/eldy/thumb.png
index 6b4c467bead..5c385e6a6ea 100644
Binary files a/htdocs/theme/eldy/thumb.png and b/htdocs/theme/eldy/thumb.png differ
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index fafa2978865..95e057e68f1 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -6,6 +6,11 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
  * Component: Info Box
  * -------------------
  */
+
+span.info-box-icon-text {	/* hide box text number due to problems */
+    display: none;
+}
+
 .info-box {
 	display: block;
 	min-height: 90px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8c6bd8d4d77..3be8d0bda2e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1061,6 +1061,10 @@ table[summary="list_of_modules"] .fa-cog {
 		font-size: <?php print $fontsize+3; ?>px !important;
 	}
 
+	.login_vertical_align {
+    	padding-left: 0;
+    }
+
 	.divmainbodylarge { margin-left: 20px; margin-right: 20px; }
 
     .tdoverflowonsmartphone {
@@ -1782,7 +1786,7 @@ div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-19); ?>px;
+	height: <?php echo ($heightmenu-22); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
@@ -2253,19 +2257,21 @@ div.blockvmenulogo
 {
 	border-bottom: 0 !important;
 }
-.backgroundforcompanylogo {
+.menulogocontainer {
     margin: <?php echo $disableimages?'0':'6'; ?>px;
     margin-left: 12px;
     margin-right: 6px;
-    background-color: rgba(255,255,255,0.7);
     padding: 0;
-    border-radius: 5px;
     height: <?php echo $disableimages?'20':'32'; ?>px;
     /* width: 100px; */
     max-width: 100px;
     vertical-align: middle;
 }
-.backgroundforcompanylogo img.mycompany {
+.backgroundforcompanylogo {
+	background-color: rgba(255,255,255,0.7);
+	border-radius: 5px;
+}
+.menulogocontainer img.mycompany {
     object-fit: contain;
     width: inherit;
     height: inherit;
@@ -3046,7 +3052,9 @@ td.evenodd, tr.nohoverpair td {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 .trforbreak td {
-	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important;
+	font-weight: bold;
+    border-bottom: 1pt solid black !important;
+	/* background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important; */
 }
 
 table.dataTable td {
@@ -3213,6 +3221,10 @@ tr.liste_sub_total, tr.liste_sub_total td {
 	-webkit-box-shadow: 0px 0px 0px #f4f4f4 !important;
 	box-shadow: 0px 0px 0px #f4f4f4 !important;
 }
+.shadow {
+	-webkit-box-shadow: 2px 2px 5px #CCC !important;
+	box-shadow: 2px 2px 5px #CCC !important;
+}
 
 div.tabBar .noborder {
 	-webkit-box-shadow: 0px 0px 0px #f4f4f4 !important;
@@ -3971,7 +3983,7 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
 .cal_peruserviewname { max-width: 140px; height: 22px; }
 
 .topmenuimage {
-	background-size: 28px auto;
+	background-size: 24px auto;
 }
 
 /* ============================================================================== */
@@ -5682,7 +5694,7 @@ border-top-right-radius: 6px;
 }
 
 .menuhider {
-	width: <?php echo $disableimages ? 'auto' : '40'; ?>px;
+	width: <?php echo $disableimages ? 'auto' : '44'; ?>px;
 }
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
@@ -5701,7 +5713,7 @@ border-top-right-radius: 6px;
   		font-size: 12px;
     }
     .topmenuimage {
-    	background-size: 26px auto;
+    	background-size: 24px auto;
     	margin-top: 0px;
 	}
     li.tmenu, li.tmenusel {
diff --git a/htdocs/theme/md/thumb.png b/htdocs/theme/md/thumb.png
index 97102ab78ca..f7d11f9a536 100644
Binary files a/htdocs/theme/md/thumb.png and b/htdocs/theme/md/thumb.png differ
diff --git a/test/phpunit/BOMTest.php b/test/phpunit/BOMTest.php
index 551722aadd2..73603a5f336 100644
--- a/test/phpunit/BOMTest.php
+++ b/test/phpunit/BOMTest.php
@@ -22,89 +22,126 @@
  * \brief   PHPUnit test for BillOfMaterials class.
  */
 
-namespace test\unit;
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/bom/class/bom.class.php';
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+$langs->load("main");
+
 
 /**
  * Class BillOfMaterialsTest
  * @package Testbillofmaterials
  */
-class BOMTest extends \PHPUnit\Framework\TestCase
+class BOMTest extends PHPUnit\Framework\TestCase
 {
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
 	/**
-	 * Global test setup
-     * @return void
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return BOMTest
 	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	// Static methods
 	public static function setUpBeforeClass()
 	{
-		fwrite(STDOUT, __METHOD__ . "\n");
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+		
+		if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+			print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
+			die();
+		}
+		if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+		if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
+		
+		print __METHOD__."\n";
+	}
+
+	// tear down after class
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
 	}
 
 	/**
-	 * Unit test setup
-     * @return void
+	 * Init phpunit tests
+	 *
+	 * @return  void
 	 */
 	protected function setUp()
 	{
-		fwrite(STDOUT, __METHOD__ . "\n");
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
 	}
 
 	/**
-	 * Verify pre conditions
-     * @return void
-	 */
-	protected function assertPreConditions()
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	/**
-	 * A sample test
-     * @return bool
-	 */
-	public function testSomething()
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-		// TODO: test something
-		$this->assertTrue(true);
-	}
-
-	/**
-	 * Verify post conditions
-     * @return void
-	 */
-	protected function assertPostConditions()
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	/**
-	 * Unit test teardown
-     * @return void
+	 * End phpunit tests
+	 *
+	 * @return  void
 	 */
 	protected function tearDown()
 	{
-		fwrite(STDOUT, __METHOD__ . "\n");
+		print __METHOD__."\n";
 	}
 
 	/**
-	 * Global test teardown
-     * @return void
-	 */
-	public static function tearDownAfterClass()
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	/**
-	 * Unsuccessful test
+	 * testBOMCreate
 	 *
-	 * @param  Exception $e    Exception
-     * @return void
-	 * @throws Exception
+     * @return int
 	 */
-	protected function onNotSuccessfulTest(Exception $e)
+	public function testBOMCreate()
 	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-		throw $e;
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new BOM($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
+
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+
+		return $localobject;
 	}
 }