diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 8d102bc8328..013db3d36f1 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -63,8 +63,6 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("expensereports");
-
 llxHeader('', $langs->trans("ExpenseReportsSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php
new file mode 100644
index 00000000000..b9c32a8b9c9
--- /dev/null
+++ b/htdocs/admin/holiday_extrafields.php
@@ -0,0 +1,118 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/admin/holiday_extrafields.php
+ *		\ingroup    holiday
+ *		\brief      Page to setup extra fields of holiday
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+if (!$user->admin)
+	accessforbidden();
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'errors', 'holiday', 'other'));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='holiday'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans("HolidaySetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("HolidaySetup"), $linkback, 'title_setup');
+
+$head = holiday_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes', $langs->trans("Holidays"), -1, 'holiday');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+    print '<div class="tabsAction">';
+    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+    print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+	print '<br><div id="newattrib"></div>';
+    print load_fiche_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition of an optional field                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+    print "<br>";
+    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 8bd64c76e2b..57dc1cbb394 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -96,11 +96,11 @@ else
 
 	<tr>
 		<td class="label1"><?php echo $langs->trans("Login"); ?></td>
-		<td><input name="txtUsername" class="texte_login" type="text" value="<?php echo $usertxt; ?>" /></td>
+		<td><input name="txtUsername" class="texte_login maxwidth150onsmartphoneimp" type="text" value="<?php echo $usertxt; ?>" /></td>
 	</tr>
 	<tr>
 		<td class="label1"><?php echo $langs->trans("Password"); ?></td>
-		<td><input name="pwdPassword" class="texte_login" type="password" value="" /></td>
+		<td><input name="pwdPassword" class="texte_login maxwidth150onsmartphoneimp" type="password" value="" /></td>
 	</tr>
 
 <?php
@@ -157,7 +157,7 @@ print '<td class="label1">'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 print '<td>';
 $defaultknown=0;
 if (! empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && $conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0) $defaultknown=1;	// If a particular stock is defined, we disable choice
-print $form->select_comptes(((GETPOST('bankid_cash') > 0)?GETPOST('bankid_cash'):$conf->global->CASHDESK_ID_BANKACCOUNT_CASH), 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", ($defaultknown?0:2));
+$form->select_comptes(((GETPOST('bankid_cash') > 0)?GETPOST('bankid_cash'):$conf->global->CASHDESK_ID_BANKACCOUNT_CASH), 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", ($defaultknown?0:2));
 print '</td>';
 print "</tr>\n";
 
@@ -166,7 +166,7 @@ print '<td class="label1">'.$langs->trans("CashDeskBankAccountForCheque").'</td>
 print '<td>';
 $defaultknown=0;
 if (! empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE) && $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0) $defaultknown=1;	// If a particular stock is defined, we disable choice
-print $form->select_comptes(((GETPOST('bankid_cheque') > 0)?GETPOST('bankid_cheque'):$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE), 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", ($defaultknown?0:2));
+$form->select_comptes(((GETPOST('bankid_cheque') > 0)?GETPOST('bankid_cheque'):$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE), 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", ($defaultknown?0:2));
 print '</td>';
 print "</tr>\n";
 
@@ -175,7 +175,7 @@ print '<td class="label1">'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 print '<td>';
 $defaultknown=0;
 if (! empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB) && $conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0) $defaultknown=1;	// If a particular stock is defined, we disable choice
-print $form->select_comptes(((GETPOST('bankid_cb') > 0)?GETPOST('bankid_cb'):$conf->global->CASHDESK_ID_BANKACCOUNT_CB), 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", ($defaultknown?0:2));
+$form->select_comptes(((GETPOST('bankid_cb') > 0)?GETPOST('bankid_cb'):$conf->global->CASHDESK_ID_BANKACCOUNT_CB), 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", ($defaultknown?0:2));
 print '</td>';
 print "</tr>\n";
 
@@ -191,7 +191,7 @@ print "</tr>\n";
 </table>
 <br>
 
-<div align="center"><span class="bouton_login"><input class="button" name="sbmtConnexion" type="submit" value=<?php echo $langs->trans("Connection"); ?> /></span></div>
+<div align="center"><span class="bouton_login"><input class="button" name="sbmtConnexion" type="submit" value="<?php echo dol_escape_htmltag($langs->trans("Connection")); ?>" /></span></div>
 
 </form>
 </fieldset>
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 2b04f83472f..3345fe6ee3e 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -323,7 +323,7 @@ if ($result)
         print '<td>';
         if (! $objp->rappro && ! $bankline->getVentilExportCompta())
         {
-        	print $form->select_comptes($acct->id, 'accountid', 0, '', 0);
+        	$form->select_comptes($acct->id, 'accountid', 0, '', 0);
         }
         else
         {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6d0bf2f56bc..f08202c1efd 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4982,7 +4982,7 @@ elseif ($id > 0 || ! empty($ref))
 			}
 
 			// Classify paid
-			if ($object->statut == 1 && $object->paye == 0 && $usercanissuepayment && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0))
+			if (($object->statut == 1 && $object->paye == 0 && $usercanissuepayment && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0)))
 				|| ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $object->total_ttc > 0 && $resteapayer == 0 && $usercanissuepayment && empty($discount->id))
 			)
 			{
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 79745113f88..9709eed637d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -321,7 +321,7 @@ if (! $resql)
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall && ! $page)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 57a076963fd..160e22f4c50 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -87,33 +87,9 @@ class Events // extends CommonObject
 		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
 		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
 		array('id'=>'USER_DELETE',            'test'=>1),
-	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
-	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
 		array('id'=>'GROUP_CREATE',           'test'=>1),
 		array('id'=>'GROUP_MODIFY',           'test'=>1),
 		array('id'=>'GROUP_DELETE',           'test'=>1),
-	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
-		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
-		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
-		array('id'=>'PROPAL_VALIDATE',        'test'=>$conf->propal->enabled),
-		array('id'=>'PROPAL_CLOSE_SIGNED',    'test'=>$conf->propal->enabled),
-		array('id'=>'PROPAL_CLOSE_REFUSED',   'test'=>$conf->propal->enabled),
-		array('id'=>'PROPAL_SENTBYMAIL',      'test'=>$conf->propal->enabled),
-		array('id'=>'ORDER_VALIDATE',         'test'=>$conf->commande->enabled),
-		array('id'=>'ORDER_SENTBYMAIL',       'test'=>$conf->commande->enabled),
-		array('id'=>'BILL_VALIDATE',          'test'=>$conf->facture->enabled),
-		array('id'=>'BILL_PAYED',             'test'=>$conf->facture->enabled),
-		array('id'=>'BILL_CANCEL',            'test'=>$conf->facture->enabled),
-		array('id'=>'BILL_SENTBYMAIL',        'test'=>$conf->facture->enabled),
-		array('id'=>'PAYMENT_CUSTOMER_CREATE','test'=>$conf->facture->enabled),
-		array('id'=>'PAYMENT_SUPPLIER_CREATE','test'=>$conf->fournisseur->enabled),
-		array('id'=>'MEMBER_CREATE',          'test'=>$conf->adherent->enabled),
-		array('id'=>'MEMBER_VALIDATE',        'test'=>$conf->adherent->enabled),
-		array('id'=>'MEMBER_SUBSCRIPTION',    'test'=>$conf->adherent->enabled),
-		array('id'=>'MEMBER_MODIFY',          'test'=>$conf->adherent->enabled),
-		array('id'=>'MEMBER_RESILIATE',       'test'=>$conf->adherent->enabled),
-		array('id'=>'MEMBER_DELETE',          'test'=>$conf->adherent->enabled),
-	*/
 	);
 
 
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 6ed17305096..ea5027de1ee 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -323,6 +323,7 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date)
  *                              0 =Input date is local date using PHP server timezone
  *  @return	int					Date as a timestamp
  *		                		19700101020000 -> 7200 with gm=1
+ *								19700101000000 -> 0 with gm=1
  *
  *  @see    dol_print_date(), dol_mktime(), dol_getdate()
  */
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index 492766192b4..960acfa3aa7 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -86,6 +86,11 @@ function holiday_admin_prepare_head()
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');
 
+    $head[$h][0] = DOL_URL_ROOT.'/admin/holiday_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin', 'remove');
 
 	return $head;
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 438ff8246ea..2aaeb967675 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -271,14 +271,19 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	// Show logo company
 	if (empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-		$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
-		if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->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);
+		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.png';
+			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo_squarred.png';
 		}
 		$title=$langs->trans("GoIntoSetupToChangeLogo");
 		print "\n".'<!-- Show logo on menu -->'."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2eead6da81d..d62cd1993fd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -43,7 +43,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  */
 function print_eldy_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=(empty($_SESSION["mainmenu"])?'':$_SESSION["mainmenu"]);
 	$leftmenu=(empty($_SESSION["leftmenu"])?'':$_SESSION["leftmenu"]);
@@ -477,8 +478,8 @@ 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=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
-		$mysoc->logo_squarred_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_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);
 		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);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 666403a7412..b51ae3d05f5 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -40,12 +40,13 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php'
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'users', 'trips'));
 
-$action=GETPOST('action', 'aZ09');
-$massaction=GETPOST('massaction', 'alpha');
-$show_files=GETPOST('show_files', 'int');
-$confirm=GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
-$contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'expensereportlist';
+$action      = GETPOST('action', 'aZ09');
+$massaction  = GETPOST('massaction', 'alpha');
+$show_files  = GETPOST('show_files', 'int');
+$confirm     = GETPOST('confirm', 'alpha');
+$cancel      = GETPOST('cancel', 'alpha');												// We click on a Cancel button
+$toselect    = GETPOST('toselect', 'array');
+$contextpage = GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'expensereportlist';
 
 $childids = $user->getAllChildIds(1);
 
@@ -136,17 +137,17 @@ $arrayfields=array(
     'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-    }
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	{
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
 }
 
 $canedituser=(! empty($user->admin) || $user->rights->user->user->creer);
 
-$object = new ExpenseReport($db);
 $objectuser = new User($db);
 
 
@@ -161,10 +162,11 @@ $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
 if (empty($reshook))
 {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha'))		// Both test must be present to be compatible with all browsers
 	{
@@ -176,7 +178,6 @@ if (empty($reshook))
 	    $search_status="";
 	    $month_start="";
 	    $year_start="";
-		$day ="";
 	    $month_end="";
 	    $year_end="";
 	    $day_end = "";
@@ -340,15 +341,15 @@ if ($resql)
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
 	$param='';
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sall)					$param.="&sall=".$sall;
-	if ($search_ref)			$param.="&search_ref=".$search_ref;
-	if ($search_user)			$param.="&search_user=".$search_user;
-	if ($search_amount_ht)		$param.="&search_amount_ht=".$search_amount_ht;
-	if ($search_amount_ttc)		$param.="&search_amount_ttc=".$search_amount_ttc;
-	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
-	if ($optioncss != '')       $param.='&optioncss='.$optioncss;
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+	if ($sall)					$param.="&sall=".urlencode($sall);
+	if ($search_ref)			$param.="&search_ref=".urlencode($search_ref);
+	if ($search_user)			$param.="&search_user=".urlencode($search_user);
+	if ($search_amount_ht)		$param.="&search_amount_ht=".urlencode($search_amount_ht);
+	if ($search_amount_ttc)		$param.="&search_amount_ttc=".urlencode($search_amount_ttc);
+	if ($search_status >= 0)  	$param.="&search_status=".urlencode($search_status);
+	if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -503,7 +504,7 @@ if ($resql)
 
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+	$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -606,7 +607,7 @@ if ($resql)
     	print '</td>';
 	}
 	// Action column
-	print '<td class="liste_titre middle">';
+	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -757,6 +758,7 @@ if ($resql)
             $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
             $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
+
             // Date creation
             if (! empty($arrayfields['d.date_create']['checked']))
             {
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 204d832a94c..be441976f67 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1311,7 +1311,7 @@ else
                 }
 
                 print '<tr>';
-                print '<td>'.$langs->trans('DateCreateCP').'</td>';
+                print '<td>'.$langs->trans('DateCreation').'</td>';
                 print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>';
                 print '</tr>';
                 if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index d767bcdc691..7557a7941fb 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -558,6 +558,7 @@ class Holiday extends CommonObject
 		$sql.= " cp.fk_user,";
 		$sql.= " cp.fk_type,";
 		$sql.= " cp.date_create,";
+		$sql.= " cp.tms as date_update,";
 		$sql.= " cp.description,";
 		$sql.= " cp.date_debut,";
 		$sql.= " cp.date_fin,";
@@ -623,6 +624,7 @@ class Holiday extends CommonObject
 				$tab_result[$i]['fk_user'] = $obj->fk_user;
 				$tab_result[$i]['fk_type'] = $obj->fk_type;
 				$tab_result[$i]['date_create'] = $this->db->jdate($obj->date_create);
+				$tab_result[$i]['date_update'] = $this->db->jdate($obj->date_update);
 				$tab_result[$i]['description'] = $obj->description;
 				$tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
 				$tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index a594a920e74..6ade6a13e17 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -251,7 +251,7 @@ if ($object->id)
     }
 
     print '<tr>';
-    print '<td>'.$langs->trans('DateCreateCP').'</td>';
+    print '<td>'.$langs->trans('DateCreation').'</td>';
     print '<td>'.dol_print_date($object->date_create,'dayhour').'</td>';
     print '</tr>';
     if ($object->statut == 3) {
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index f74d731e8bd..145f2f7b48f 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -27,6 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
@@ -40,16 +41,19 @@ $langs->loadLangs(array('users', 'holidays', 'hrm'));
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
-$action     = GETPOST('action', 'alpha');												// The action 'add', 'create', 'edit', 'update', 'view', ...
+$action     = GETPOST('action', 'aZ09');												// The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha');											// The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int');												// Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha');												// Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha');												// We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array');												// Array of ids of elements selected into a list
-$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'myobjectlist';   // To manage different context of search
+$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'holidaylist';  // To manage different context of search
+
 $backtopage = GETPOST('backtopage', 'alpha');											// Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ');												// Option for the css output (always '' except when 'print')
 
+$id = GETPOST('id', 'int');
+
 $childids = $user->getAllChildIds(1);
 
 // Security check
@@ -59,8 +63,7 @@ if ($user->societe_id > 0)	// Protection if external user
 	//$socid = $user->societe_id;
 	accessforbidden();
 }
-$result = restrictedArea($user, 'holiday', $id, '');
-$id = GETPOST('id', 'int');
+$result = restrictedArea($user, 'holiday', '', '');
 // If we are on the view of a specific user
 if ($id > 0)
 {
@@ -74,6 +77,9 @@ if ($id > 0)
     }
 }
 
+$diroutputmassaction=$conf->holiday->dir_output . '/temp/massgeneration/'.$user->id;
+
+
 // Load variable for pagination
 $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
@@ -83,20 +89,8 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-
-// Initialize technical objects
-$object=new Holiday($db);
-$extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->holiday->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('holidaylist'));     // Note that conf->hooks_modules contains array
-// Fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('holiday');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
-
-// Default sort order (if not yet defined by previous GETPOST)
-if (! $sortfield) $sortfield="cp.rowid";
-if (! $sortorder) $sortorder="DESC";
-
+if (!$sortorder) $sortorder="DESC";
+if (!$sortfield) $sortfield="cp.rowid";
 
 $sall                = trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
 $search_ref          = GETPOST('search_ref', 'alphanohtml');
@@ -114,13 +108,47 @@ $search_valideur     = GETPOST('search_valideur', 'int');
 $search_statut       = GETPOST('search_statut', 'int');
 $search_type         = GETPOST('search_type', 'int');
 
+// Initialize technical objects
+$object=new Holiday($db);
+$extrafields = new ExtraFields($db);
+$hookmanager->initHooks(array('holidaylist'));     // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('holiday');
+$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
     'cp.description'=>'Description',
     'uu.lastname'=>'EmployeeLastname',
-    'uu.firstname'=>'EmployeeFirstname'
+    'uu.firstname'=>'EmployeeFirstname',
+	'uu.login'=>'Login'
 );
 
+$arrayfields=array(
+	'cp.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'cp.fk_user'=>array('label'=>$langs->trans("Employee"), 'checked'=>1, 'position'=>20),
+	'cp.fk_validator'=>array('label'=>$langs->trans("ValidatorCP"), 'checked'=>1, 'position'=>30),
+	'cp.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1, 'position'=>35),
+	'duration'=>array('label'=>$langs->trans("NbUseDaysCPShort"), 'checked'=>1, 'position'=>38),
+	'cp.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>40),
+	'cp.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>42),
+	'cp.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1, 'position'=>60),
+	'cp.date_approve'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1, 'position'=>70),
+	'cp.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	'cp.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>501),
+	'cp.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+);
+// Extra fields
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
+{
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	{
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
+}
+
 
 
 /*
@@ -130,7 +158,7 @@ $fieldstosearchall = array(
 if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
 if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
-$parameters=array();
+$parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
@@ -180,19 +208,20 @@ if (empty($reshook))
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$formfile = new FormFile($db);
 
-$holiday = new Holiday($db);
 $holidaystatic=new Holiday($db);
 $fuser = new User($db);
 
 // Update sold
-$result = $holiday->updateBalance();
+$result = $object->updateBalance();
 
 $max_year = 5;
 $min_year = 10;
 $filter='';
 
-llxHeader('', $langs->trans('CPTitreMenu'));
+$title = $langs->trans('CPTitreMenu');
+llxHeader('', $title);
 
 $order = $db->order($sortfield, $sortorder).$db->plimit($limit + 1, $offset);
 
@@ -231,6 +260,16 @@ if (!empty($sall))
 
 if (empty($user->rights->holiday->read_all)) $filter.=' AND cp.fk_user IN ('.join(',', $childids).')';
 
+$sql='';
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
+$filter.=$sql;
+
 
 // Récupération de l'ID de l'utilisateur
 $user_id = $user->id;
@@ -246,29 +285,29 @@ if ($id > 0)
 }
 
 // Récupération des congés payés de l'utilisateur ou de tous les users de sa hierarchy
-// Load array $holiday->holiday
+// Load array $object->holiday
 if (empty($user->rights->holiday->read_all) || $id > 0)
 {
-	if ($id > 0) $result = $holiday->fetchByUser($id, $order, $filter);
-	else  $result = $holiday->fetchByUser(join(',', $childids), $order, $filter);
+	if ($id > 0) $result = $object->fetchByUser($id, $order, $filter);
+	else  $result = $object->fetchByUser(join(',', $childids), $order, $filter);
 }
 else
 {
-    $result = $holiday->fetchAll($order, $filter);
+    $result = $object->fetchAll($order, $filter);
 }
 // Si erreur SQL
 if ($result == '-1')
 {
     print load_fiche_titre($langs->trans('CPTitreMenu'), '', 'title_hrm.png');
 
-    dol_print_error($db, $langs->trans('Error').' '.$holiday->error);
+    dol_print_error($db, $langs->trans('Error').' '.$object->error);
     exit();
 }
 
 
 // Show table of vacations
 
-$num = count($holiday->holiday);
+$num = count($object->holiday);
 
 $arrayofselected=is_array($toselect)?$toselect:array();
 
@@ -280,7 +319,7 @@ if ($search_ref)          $param.='&search_ref='.urlencode($search_ref);
 if ($search_day_create)          $param.='&search_day_create='.urlencode($search_day_create);
 if ($search_month_create)        $param.='&search_month_create='.urlencode($search_month_create);
 if ($search_year_create)         $param.='&search_year_create='.urlencode($search_year_create);
-if ($search_search_day_start)    $param.='&search_day_start='.urlencode($search_day_start);
+if ($search_day_start)           $param.='&search_day_start='.urlencode($search_day_start);
 if ($search_month_start)         $param.='&search_month_start='.urlencode($search_month_start);
 if ($search_year_start)          $param.='&search_year_start='.urlencode($search_year_start);
 if ($search_day_end)             $param.='&search_day_end='.urlencode($search_day_end);
@@ -290,19 +329,23 @@ if ($search_employee > 0) $param.='&search_employee='.urlencode($search_employee
 if ($search_valideur > 0) $param.='&search_valideur='.urlencode($search_valideur);
 if ($search_type > 0)     $param.='&search_type='.urlencode($search_type);
 if ($search_statut > 0)   $param.='&search_statut='.urlencode($search_statut);
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions =  array(
-//'presend'=>$langs->trans("SendByMail"),
-//'builddoc'=>$langs->trans("PDFMerge"),
+	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
 );
-if ($user->rights->holiday->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->holiday->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -326,7 +369,7 @@ if ($id > 0)		// For user tab
 
 	    print '<br>';
 
-	    showMyBalance($holiday, $user_id);
+	    showMyBalance($object, $user_id);
 	}
 
 	dol_fiche_end();
@@ -346,9 +389,11 @@ if ($id > 0)		// For user tab
 }
 else
 {
-	$nbtotalofrecords = count($holiday->holiday);
+	$nbtotalofrecords = count($object->holiday);
    	//print $num;
-    //print count($holiday->holiday);
+    //print count($object->holiday);
+
+	$title = $langs->trans("ListeCP");
 
 	$newcardbutton='';
 	if ($user->rights->holiday->write)
@@ -356,7 +401,7 @@ else
 		$newcardbutton.= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request');
     }
 
-	print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit);
 
 	$topicmail="Information";
 	$modelmail="leaverequest";
@@ -371,126 +416,184 @@ if ($sall)
     print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'</div>';
 }
 
+$moreforfilter='';
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if (! empty($moreforfilter))
+{
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields='';	// $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+
+$include = '';
+if (! empty($user->rights->holiday->read_all)) $include = 'hierarchyme';		// Can see all
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
+
 // Filters
 print '<tr class="liste_titre_filter">';
-print '<td class="liste_titre">';
-print '<input class="flat" size="4" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-print '</td>';
 
-// Create date
-print '<td class="liste_titre center">';
-print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
-$formother->select_year($search_year_create, 'search_year_create', 1, $min_year, 0);
-print '</td>';
-
-
-$morefilter = 'AND employee = 1';
-if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
-
-// User
-$disabled=0;
-// If into the tab holiday of a user ($id is set in such a case)
-if ($id && ! GETPOSTISSET('search_employee'))
+if (! empty($arrayfields['cp.ref']['checked']))
 {
-	$search_employee=$id;
-	$disabled=1;
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="4" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
 }
-if (! empty($user->rights->holiday->read_all))	// Can see all
+
+if (! empty($arrayfields['cp.fk_user']['checked']))
 {
-	if (GETPOSTISSET('search_employee')) $search_employee=GETPOST('search_employee', 'int');
+	$morefilter = 'AND employee = 1';
+	if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
+
+	// User
+	$disabled=0;
+	// If into the tab holiday of a user ($id is set in such a case)
+	if ($id && ! GETPOSTISSET('search_employee'))
+	{
+		$search_employee=$id;
+		$disabled=1;
+	}
+
 	print '<td class="liste_titre maxwidthonsmartphone left">';
-	print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
-    print '</td>';
-}
-else
-{
-	if (GETPOSTISSET('search_employee')) $search_employee=GETPOST('search_employee', 'int');
-    print '<td class="liste_titre maxwidthonsmartphone left">';
-    print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
-    print '</td>';
+	print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print '</td>';
 }
 
-// Approve
-if ($user->rights->holiday->read_all)
+// Approver
+if (! empty($arrayfields['cp.fk_validator']['checked']))
 {
-    print '<td class="liste_titre maxwidthonsmartphone left">';
-
-    $validator = new UserGroup($db);
-    $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
-    $valideurobjects = $validator->listUsersForGroup($excludefilter);
-    $valideurarray = array();
-    foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
-    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
-    print '</td>';
-}
-else
-{
-    print '<td class="liste_titre">&nbsp;</td>';
+	if ($user->rights->holiday->read_all)
+	{
+	    print '<td class="liste_titre maxwidthonsmartphone left">';
+	    $validator = new UserGroup($db);
+	    $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
+	    $valideurobjects = $validator->listUsersForGroup($excludefilter);
+	    $valideurarray = array();
+	    foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
+	    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	    print '</td>';
+	}
+	else
+	{
+	    print '<td class="liste_titre">&nbsp;</td>';
+	}
 }
 
 // Type
-print '<td class="liste_titre">';
-if (empty($mysoc->country_id)) {
-	setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"),$langs->trans("CompanyFoundation")), 'errors');
-} else {
-	$typeleaves=$holidaystatic->getTypes(1, -1);
-	$arraytypeleaves=array();
-	foreach($typeleaves as $key => $val)
-	{
-		$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
-		//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
-		$arraytypeleaves[$val['rowid']]=$labeltoshow;
+if (! empty($arrayfields['cp.fk_type']['checked']))
+{
+	print '<td class="liste_titre">';
+	if (empty($mysoc->country_id)) {
+		setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"),$langs->trans("CompanyFoundation")), 'errors');
+	} else {
+		$typeleaves=$holidaystatic->getTypes(1, -1);
+		$arraytypeleaves=array();
+		foreach($typeleaves as $key => $val)
+		{
+			$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
+			//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
+			$arraytypeleaves[$val['rowid']]=$labeltoshow;
+		}
+		print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
 	}
-	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
+	print '</td>';
 }
-print '</td>';
 
 // Duration
-print '<td class="liste_titre">&nbsp;</td>';
+if (! empty($arrayfields['duration']['checked']))
+{
+	print '<td class="liste_titre">&nbsp;</td>';
+}
 
 // Start date
-print '<td class="liste_titre center">';
-print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_start" value="'.dol_escape_htmltag($search_month_start).'">';
-$formother->select_year($search_year_start, 'search_year_start', 1, $min_year, $max_year);
-print '</td>';
+if (! empty($arrayfields['cp.date_debut']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_start" value="'.dol_escape_htmltag($search_month_start).'">';
+	$formother->select_year($search_year_start, 'search_year_start', 1, $min_year, $max_year);
+	print '</td>';
+}
 
 // End date
-print '<td class="liste_titre center">';
-print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
-$formother->select_year($search_year_end, 'search_year_end', 1, $min_year, $max_year);
-print '</td>';
+if (! empty($arrayfields['cp.date_fin']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
+	$formother->select_year($search_year_end, 'search_year_end', 1, $min_year, $max_year);
+	print '</td>';
+}
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+// Fields from hook
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Create date
+if (! empty($arrayfields['cp.date_create']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
+	$formother->select_year($search_year_create, 'search_year_create', 1, $min_year, 0);
+	print '</td>';
+}
+
+// Create date
+if (! empty($arrayfields['cp.tms']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_update" value="'.dol_escape_htmltag($search_month_update).'">';
+	$formother->select_year($search_year_update, 'search_year_update', 1, $min_year, 0);
+	print '</td>';
+}
 
 // Status
-print '<td class="liste_titre maxwidthonsmartphone maxwidth200 right">';
-$holiday->selectStatutCP($search_statut, 'search_statut');
-print '</td>';
+if (! empty($arrayfields['cp.statut']['checked']))
+{
+	print '<td class="liste_titre maxwidthonsmartphone maxwidth200 right">';
+	$object->selectStatutCP($search_statut, 'search_statut');
+	print '</td>';
+}
 
 // Actions
 print '<td class="liste_titre maxwidthsearch">';
-$searchpicto=$form->showFilterAndCheckAddButtons(0);
+$searchpicto=$form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("DateCreateCP", $_SERVER["PHP_SELF"], "cp.date_create", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("ValidatorCP", $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("Type", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-print_liste_field_titre("NbUseDaysCPShort", $_SERVER["PHP_SELF"], '', '', $pram, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre("DateDebCP", $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre("DateFinCP", $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (! empty($arrayfields['cp.ref']['checked']))                  print_liste_field_titre($arrayfields['cp.ref']['label'],          $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder);
+if (! empty($arrayfields['cp.fk_user']['checked']))              print_liste_field_titre($arrayfields['cp.fk_user']['label'],      $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder);
+if (! empty($arrayfields['cp.fk_validator']['checked']))         print_liste_field_titre($arrayfields['cp.fk_validator']['label'], $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder);
+if (! empty($arrayfields['cp.fk_type']['checked']))              print_liste_field_titre($arrayfields['cp.fk_type']['label'],      $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+if (! empty($arrayfields['duration']['checked']))                print_liste_field_titre($arrayfields['duration']['label'],        $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+if (! empty($arrayfields['cp.date_debut']['checked']))           print_liste_field_titre($arrayfields['cp.date_debut']['label'],   $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['cp.date_fin']['checked']))             print_liste_field_titre($arrayfields['cp.date_fin']['label'],     $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
+$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['cp.date_create']['checked']))          print_liste_field_titre($arrayfields['cp.date_create']['label'], $_SERVER["PHP_SELF"], "cp.date_create", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['cp.tms']['checked']))                  print_liste_field_titre($arrayfields['cp.tms']['label'],   $_SERVER["PHP_SELF"], "cp.tms", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['cp.statut']['checked']))               print_liste_field_titre("Status",       $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 print "</tr>\n";
 
 $listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
@@ -502,15 +605,17 @@ if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids)
 	print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
 	$result = 0;
 }
-elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
+elseif (! empty($object->holiday) && !empty($mysoc->country_id))
 {
     // Lines
     $userstatic = new User($db);
     $approbatorstatic = new User($db);
 
-	$typeleaves=$holiday->getTypes(1, -1);
+	$typeleaves=$object->getTypes(1, -1);
 
-	foreach($holiday->holiday as $infos_CP)
+	$i = 0;
+	$totalarray=array();
+	foreach($object->holiday as $infos_CP)
 	{
 		// Leave request
 		$holidaystatic->id=$infos_CP['rowid'];
@@ -533,34 +638,86 @@ elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
 		$approbatorstatic->photo=$infos_CP['validator_photo'];
 
 		$date = $infos_CP['date_create'];
+		$date_modif = $infos_CP['date_update'];
 
 		$starthalfday=($infos_CP['halfday'] == -1 || $infos_CP['halfday'] == 2)?'afternoon':'morning';
 		$endhalfday=($infos_CP['halfday'] == 1 || $infos_CP['halfday'] == 2)?'morning':'afternoon';
 
 		print '<tr class="oddeven">';
-		print '<td>';
-		print $holidaystatic->getNomUrl(1, 1);
-		print '</td>';
-		print '<td style="text-align: center;">'.dol_print_date($date, 'day').'</td>';
-		print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-		print '<td>'.$approbatorstatic->getNomUrl(-1).'</td>';
-		print '<td>';
-		$labeltypeleavetoshow = ($langs->trans($typeleaves[$infos_CP['fk_type']]['code'])!=$typeleaves[$infos_CP['fk_type']]['code'] ? $langs->trans($typeleaves[$infos_CP['fk_type']]['code']) : $typeleaves[$infos_CP['fk_type']]['label']);
-		print empty($typeleaves[$infos_CP['fk_type']]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $infos_CP['fk_type']) : $labeltypeleavetoshow;
-		print '</td>';
-		print '<td class="right">';
-		$nbopenedday=num_open_day($infos_CP['date_debut_gmt'], $infos_CP['date_fin_gmt'], 0, 1, $infos_CP['halfday']);
-		print $nbopenedday.' '.$langs->trans('DurationDays');
-		print '</td>';
-		print '<td class="center">';
-		print dol_print_date($infos_CP['date_debut'], 'day');
-		print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
-		print '</td>';
-		print '<td class="center">';
-		print dol_print_date($infos_CP['date_fin'], 'day');
-		print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
-		print '</td>';
-		print '<td class="right">'.$holidaystatic->LibStatut($infos_CP['statut'], 5).'</td>';
+
+		if (! empty($arrayfields['cp.ref']['checked']))
+		{
+			print '<td>';
+			print $holidaystatic->getNomUrl(1, 1);
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['cp.fk_user']['checked']))
+		{
+			print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['cp.fk_validator']['checked']))
+		{
+			print '<td>'.$approbatorstatic->getNomUrl(-1).'</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['cp.fk_type']['checked']))
+		{
+			print '<td>';
+			$labeltypeleavetoshow = ($langs->trans($typeleaves[$infos_CP['fk_type']]['code'])!=$typeleaves[$infos_CP['fk_type']]['code'] ? $langs->trans($typeleaves[$infos_CP['fk_type']]['code']) : $typeleaves[$infos_CP['fk_type']]['label']);
+			print empty($typeleaves[$infos_CP['fk_type']]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $infos_CP['fk_type']) : $labeltypeleavetoshow;
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['duration']['checked']))
+		{
+			print '<td class="right">';
+			$nbopenedday=num_open_day($infos_CP['date_debut_gmt'], $infos_CP['date_fin_gmt'], 0, 1, $infos_CP['halfday']);
+			print $nbopenedday.' '.$langs->trans('DurationDays');
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['cp.date_debut']['checked']))
+		{
+			print '<td class="center">';
+			print dol_print_date($infos_CP['date_debut'], 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['cp.date_fin']['checked']))
+		{
+			print '<td class="center">';
+			print dol_print_date($infos_CP['date_fin'], 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		// Date creation
+		if (! empty($arrayfields['cp.date_create']['checked']))
+		{
+			print '<td style="text-align: center;">'.dol_print_date($date, 'day').'</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['cp.tms']['checked']))
+		{
+			print '<td style="text-align: center;">'.dol_print_date($date_modif, 'day').'</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+		if (! empty($arrayfields['cp.statut']['checked']))
+		{
+			print '<td class="right nowrap">'.$holidaystatic->LibStatut($infos_CP['statut'], 5).'</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
 
 	    // Action column
 	    print '<td class="nowrap center">';
@@ -571,8 +728,11 @@ elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
 			print '<input id="cb'.$infos_CP['rowid'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$infos_CP['rowid'].'"'.($selected?' checked="checked"':'').'>';
 	    }
 		print '</td>';
+		if (! $i) $totalarray['nbfield']++;
 
 		print '</tr>'."\n";
+
+		$i++;
 	}
 }
 
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index aaa96e3136a..0e2a1875e21 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -113,12 +113,13 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167);
--- actions not enabled by default (no constant created for that) when we enable module agenda 
+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);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
+-- actions not enabled by default : they are excluded when we enable the module Agenda (except TASK_...)
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',150);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',151);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',152);
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 92dcdce1128..45bd666abb0 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
@@ -33,6 +33,23 @@ ALTER TABLE llx_account_bookkeeping ADD COLUMN date_export datetime DEFAULT NULL
 ALTER TABLE llx_expensereport ADD COLUMN paid smallint default 0 NOT NULL;
 UPDATE llx_expensereport set paid = 1 WHERE fk_statut = 6 and paid = 0;
 
+
+-- For v11
+
+create table llx_holiday_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_holiday_extrafields ADD INDEX idx_holiday_extrafields (fk_object);
+
+ALTER TABLE llx_societe_rib MODIFY label varchar(200);
+
+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
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 51fe48dcda2..4d87203b068 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -468,6 +468,12 @@ UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS
 -- UPDATE llx_facturedet_rec set label = NULL WHERE label IS NOT NULL;
 
 
+-- Note to make all deposit as payed when there is already a discount generated from it.
+--drop table tmp_invoice_deposit_mark_as_available;
+--create table tmp_invoice_deposit_mark_as_available as select * from llx_facture as f where f.type = 3 and f.paye = 0 and f.rowid in (select fk_facture_source from llx_societe_remise_except);
+--update llx_facture set paye = 1 where rowid in (select rowid from tmp_invoice_deposit_mark_as_available);
+
+
 
 -- Note to migrate from old counter aquarium to new one
 -- drop table tmp;
diff --git a/htdocs/install/mysql/tables/llx_holiday_extrafields.key.sql b/htdocs/install/mysql/tables/llx_holiday_extrafields.key.sql
new file mode 100644
index 00000000000..6558fdef503
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_holiday_extrafields.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_holiday_extrafields ADD INDEX idx_holiday_extrafields (fk_object);
+
diff --git a/htdocs/install/mysql/tables/llx_holiday_extrafields.sql b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
new file mode 100644
index 00000000000..29881bbb0cb
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+create table llx_holiday_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index 5bfc6d10fd6..adabd0ab35f 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -24,7 +24,7 @@ create table llx_societe_rib
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
   type           varchar(32) DEFAULT 'ban' NOT NULL,							-- 'ban' or 'paypal' or 'card' or 'stripe'
-  label          varchar(30),
+  label          varchar(200),
   fk_soc         integer NOT NULL,
   datec          datetime,
   tms            timestamp,
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 145f996c4f2..9e31180f3ea 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -8,7 +8,6 @@ NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
-DateCreateCP=Creation date
 DraftCP=Draft
 ToReviewCP=Awaiting approval
 ApprovedCP=Approved
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a2bd9d39fe7..b7baf32089f 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -291,7 +291,7 @@ else
 }
 
 // Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && ! $page)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index abad76ce228..8f946a30001 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -197,7 +197,7 @@ if (! empty($conf->banque->enabled))
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccount").'</td><td>';
-	print $form->select_comptes($conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	$form->select_comptes($conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 	print '</td></tr>';
 }
 
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index aefcb50369a..545fe9c368c 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -214,7 +214,7 @@ if (! empty($conf->banque->enabled))
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccount").'</td><td>';
-	print $form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	$form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 	print '</td></tr>';
 }
 
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 26cb0e7b828..6b9247530fd 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -54,19 +54,17 @@ $sortorder = GETPOST("sortorder", 'alpha');
 $max=3;
 
 
-
 /*
  * View
  */
 
 $companystatic=new Societe($db);
 $projectstatic=new Project($db);
-$userstatic=new User($db);
 $form=new Form($db);
 $formfile=new FormFile($db);
 
 $projectset = ($mine?$mine:(empty($user->rights->projet->all->lire)?0:2));
-$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, $projetset, 1);
+$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, $projectset, 1);
 //var_dump($projectsListId);
 
 llxHeader("", $langs->trans("Projects"), "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
@@ -80,14 +78,15 @@ $titleall=$langs->trans("AllAllowedProjects");
 if (! empty($user->rights->projet->all->lire) && ! $socid) $titleall=$langs->trans("AllProjects");
 else $titleall=$langs->trans("AllAllowedProjects").'<br><br>';
 
-
 $morehtml='';
-$morehtml.='<form name="projectform">';
+$morehtml.='<form name="projectform" method="POST">';
+$morehtml.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 $morehtml.='<SELECT name="search_project_user">';
 $morehtml.='<option name="all" value="0"'.($mine?'':' selected').'>'.$titleall.'</option>';
 $morehtml.='<option name="mine" value="'.$user->id.'"'.(($search_project_user == $user->id)?' selected':'').'>'.$langs->trans("ProjectsImContactFor").'</option>';
 $morehtml.='</SELECT>';
 $morehtml.='<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
+$morehtml.='</form>';
 
 print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'title_project.png', 0, $morehtml);
 
@@ -170,7 +169,6 @@ print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppst
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
-
 // Last modified projects
 $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.tms as datem,";
 $sql.= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas";
diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index d137b7be456..7f482367eba 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -23,13 +23,14 @@ a:hover {
 	font-weight: normal;
 	color: #444444 !important;
 
-	margin: 8px 0px 8px 2px;
+	margin: 8px 2px 8px 2px;
 
 	/*border: 1px solid #bbb;
 	border-radius: 8px;
 	-moz-border-radius: 8px;*/
-
 	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
+
+	max-width: 346px;
 }
 .csscolumns {
     margin-top: 6px;
@@ -99,7 +100,7 @@ img.demothumb {
     width: 110px;
 }
 .demobackground {
-    background-image: url('dolibarr_demo_ban.jpg');
+    background-image: linear-gradient(to bottom, rgba(250,250,255,0.5), rgba(250,250,255,0.4)), url('dolibarr_demo_ban.jpg');
     background-size: cover;
     object-fit: contain;
     height: 140px;
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 62de885eac6..d2633d9c708 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -336,7 +336,7 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div id="div'.$profilearray['key'].'" summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
+        print '<div id="div'.$profilearray['key'].'" summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'">'."\n";
 
 
         print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
diff --git a/htdocs/public/paybox/index.php b/htdocs/public/paybox/index.php
deleted file mode 100644
index 58d748aba72..00000000000
--- a/htdocs/public/paybox/index.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/index.php
- *		\ingroup    core
- *		\brief      A redirect page to an error
- *		\author	    Laurent Destailleur
- */
-
-require '../../master.inc.php';
-
-header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
deleted file mode 100644
index 319c40f2c18..00000000000
--- a/htdocs/public/paybox/newpayment.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin        <regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/newpayment.php
- *		\ingroup    paybox
- *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- *		\author	    Laurent Destailleur
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('', 0, 0, 1);
-
-$newurl = $_SERVER['REQUEST_URI'];
-$newurl = preg_replace('/\/paybox\/newpayment/', '/payment/newpayment', $newurl);
-header("Location: ".$newurl.(preg_match('/\?/', $newurl)?'&':'?').'paymentmethod=paybox');
-exit;
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
deleted file mode 100644
index a2f9f52e9e5..00000000000
--- a/htdocs/public/paybox/paymentko.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentko.php
- *		\ingroup    paybox
- *		\brief      File to show page after a failed payment
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paybox';
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-
-if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
-{
-    // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('PAYBOX_PAYMENT_OK', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-    // Send an email
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))  $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    if ($sendemail)
-    {
-    	$sendto=$sendemail;
-    	$from=$conf->global->MAILING_EMAIL_FROM;
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
-    	$content="";
-    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
-    	$content.="\n";
-    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-    	$content.="tag=".$fulltag."\npaymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-    	$result=$mailfile->sendfile();
-    	if ($result)
-    	{
-    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-    	}
-    	else
-    	{
-    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-    	}
-    }
-
-    unset($_SESSION['ipaddress']);
-}
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>\n";
-
-$key='ONLINE_PAYMENT_MESSAGE_KO';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
deleted file mode 100644
index efa49ce84fc..00000000000
--- a/htdocs/public/paybox/paymentok.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentok.php
- *		\ingroup    paybox
- *		\brief      File to show page after a successful payment
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-/*$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYBOXTOKEN=GETPOST('TOKEN');
-if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
-$PAYBOXPAYERID=GETPOST('PAYERID');
-if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
-*/
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paybox';
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-// Get on url call
-/*
-$onlinetoken              = $PAYBOXTOKEN;
-*/
-$fulltag            = $FULLTAG;
-/*$payerID            = $PAYBOXPAYERID;
-// Set by newpayment.php
-$paymentType        = $_SESSION['PaymentType'];
-$currencyCodeType   = $_SESSION['currencyCodeType'];
-$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-// From env
-$ipaddress          = $_SESSION['ipaddress'];
-
-dol_syslog("Call newpaymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
-*/
-
-
-print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
-
-$key='ONLINE_PAYMENT_MESSAGE_OK';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYBOX_PAYMENT_OK', $object, $user, $langs, $conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-$tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-// Send an email
-if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
-{
-	$sendto=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-	// Define $urlwithroot
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-	// Define link to login card
-	$appli=constant('DOL_APPLICATION_TITLE');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
-	}
-	else $appli.=" ".DOL_VERSION;
-
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
-	$content="";
-	if (! empty($tmptag['MEM']))
-	{
-		$langs->load("members");
-		$url=$urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
-		$content.=$langs->trans("PaymentSubscription")."<br>\n";
-		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-	}
-	else
-	{
-		$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
-	}
-	$content.="<br>\n";
-	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-	$content.="tag=".$fulltag."<br>\n";
-
-	$ishtml=dol_textishtml($content);	// May contain urls
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-	// Send an email
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
-}
-
-
-
-print "\n</div>\n";
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();
diff --git a/htdocs/public/paypal/index.php b/htdocs/public/paypal/index.php
deleted file mode 100644
index 0cba12e6aa2..00000000000
--- a/htdocs/public/paypal/index.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paypal/index.php
- *		\ingroup    core
- *		\brief      A redirect page to an error
- *		\author	    Laurent Destailleur
- */
-
-require '../../master.inc.php';
-
-header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
deleted file mode 100644
index ce6bb62500b..00000000000
--- a/htdocs/public/paypal/newpayment.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For paypal test: https://developer.paypal.com/
- * For paybox test: ???
- */
-
-/**
- *     	\file       htdocs/public/paypal/newpayment.php
- *		\ingroup    paypal
- *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->paypal->enabled)) accessforbidden('', 0, 0, 1);
-
-$newurl = $_SERVER['REQUEST_URI'];
-$newurl = preg_replace('/\/paypal\/newpayment/', '/payment/newpayment', $newurl);
-header("Location: ".$newurl.(preg_match('/\?/', $newurl)?'&':'?').'paymentmethod=paypal');
-exit;
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
deleted file mode 100644
index 2a80f5e5ba4..00000000000
--- a/htdocs/public/paypal/paymentko.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paypal/paymentko.php
- *		\ingroup    paypal
- *		\brief      File to show page after a failed payment.
- *                  This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx
- *                  This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paypal->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paypal';
-
-
-/*
- * Actions
- */
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paypal');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
-
-if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
-{
-    // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('PAYPAL_PAYMENT_KO', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-    // Send an email
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))  $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    if ($sendemail)
-    {
-    	$sendto=$sendemail;
-    	$from=$conf->global->MAILING_EMAIL_FROM;
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
-    	$content="";
-    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
-    	$content.="\n";
-    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-    	$result=$mailfile->sendfile();
-    	if ($result)
-    	{
-    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-    	}
-    	else
-    	{
-    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-    	}
-    }
-
-    unset($_SESSION['ipaddress']);
-}
-
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show ko message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
-
-$key='ONLINE_PAYMENT_MESSAGE_KO';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
deleted file mode 100644
index 6319945ce00..00000000000
--- a/htdocs/public/paypal/paymentok.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paypal/paymentok.php
- *		\ingroup    paypal
- *		\brief      File to show page after a successful payment
- *                  This page is called by paypal with url provided to payal completed with parameter TOKEN=xxx
- *                  This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paypal->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main","other","dict","bills","companies","paybox","paypal","stripe"));
-
-// Clean parameters
-$PAYPAL_API_USER="";
-if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
-$PAYPAL_API_PASSWORD="";
-if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
-$PAYPAL_API_SIGNATURE="";
-if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
-$PAYPAL_API_SANDBOX="";
-if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
-$PAYPAL_API_OK="";
-if ($urlok) $PAYPAL_API_OK=$urlok;
-$PAYPAL_API_KO="";
-if ($urlko) $PAYPAL_API_KO=$urlko;
-if (empty($PAYPAL_API_USER))
-{
-    dol_print_error('', "Paypal setup param PAYPAL_API_USER not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_PASSWORD))
-{
-    dol_print_error('', "Paypal setup param PAYPAL_API_PASSWORD not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_SIGNATURE))
-{
-    dol_print_error('', "Paypal setup param PAYPAL_API_SIGNATURE not defined");
-    return -1;
-}
-
-$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paypal';
-
-
-/*
- * Actions
- */
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayPal payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paypal');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
-
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-if ($PAYPALTOKEN)
-{
-    // Get on url call
-    $onlinetoken        = $PAYPALTOKEN;
-    $fulltag            = $FULLTAG;
-    $payerID            = $PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-
-	dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
-
-
-	// Validate record
-    if (! empty($paymentType))
-    {
-        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_paypal');
-        $resArray=getDetails($onlinetoken);
-        //var_dump($resarray);
-
-        dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
-        $resArray=confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
-
-        $ack = strtoupper($resArray["ACK"]);
-        if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
-        {
-        	$object->source		= $source;
-        	$object->ref		= $ref;
-        	$object->payerID	= $payerID;
-        	$object->fulltag	= $fulltag;
-        	$object->resArray	= $resArray;
-
-            // resArray was built from a string like that
-            // TOKEN=EC%2d1NJ057703V9359028&TIMESTAMP=2010%2d11%2d01T11%3a40%3a13Z&CORRELATIONID=1efa8c6a36bd8&ACK=Success&VERSION=56&BUILD=1553277&TRANSACTIONID=9B994597K9921420R&TRANSACTIONTYPE=expresscheckout&PAYMENTTYPE=instant&ORDERTIME=2010%2d11%2d01T11%3a40%3a12Z&AMT=155%2e57&FEEAMT=5%2e54&TAXAMT=0%2e00&CURRENCYCODE=EUR&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None
-            $PAYMENTSTATUS=urldecode($resArray["PAYMENTSTATUS"]);   // Should contains 'Completed'
-            $TRANSACTIONID=urldecode($resArray["TRANSACTIONID"]);
-            $TAXAMT=urldecode($resArray["TAXAMT"]);
-            $NOTE=urldecode($resArray["NOTE"]);
-
-            print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-            print $langs->trans("ThisIsTransactionId", $TRANSACTIONID)."<br><br>\n";
-
-			$key='ONLINE_PAYMENT_MESSAGE_OK';
-			if (! empty($conf->global->$key)) print $conf->global->$key;
-
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('PAYPAL_PAYMENT_OK', $object, $user, $langs, $conf);
-            if ($result < 0) { $error++; $errors=$interface->errors; }
-            // Fin appel triggers
-
-            $tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-        	// Send an email
-			if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
-			{
-				$sendto=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-				$from=$conf->global->MAILING_EMAIL_FROM;
-				// Define $urlwithroot
-				$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-				// Define link to login card
-				$appli=constant('DOL_APPLICATION_TITLE');
-				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-				{
-				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-				    if (preg_match('/\d\.\d/', $appli))
-				    {
-				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-				    }
-				    else $appli.=" ".DOL_VERSION;
-				}
-				else $appli.=" ".DOL_VERSION;
-
-				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
-				$content="";
-				if (! empty($tmptag['MEM']))
-				{
-					$langs->load("members");
-					$url=$urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
-					$content.=$langs->trans("PaymentSubscription")."<br>\n";
-					$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-					$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-				}
-				else
-				{
-					$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
-				}
-				$content.="<br>\n";
-				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-				$ishtml=dol_textishtml($content);	// May contain urls
-
-				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-				$result=$mailfile->sendfile();
-				if ($result)
-				{
-					dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-				}
-				else
-				{
-					dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-				}
-			}
-        }
-        else
-		{
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('PAYPAL_PAYMENT_KO', $object, $user, $langs, $conf);
-            if ($result < 0) { $error++; $errors=$interface->errors; }
-            // Fin appel triggers
-
-		    //Display a user friendly Error on the page using any of the following error information returned by PayPal
-            $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
-            $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
-            $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
-            $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
-
-            echo $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
-            echo $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
-            echo $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
-            echo $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
-            echo $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
-
-            if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
-
-            $tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-           	// Send an email
-			if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
-			{
-				$sendto=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-				$from=$conf->global->MAILING_EMAIL_FROM;
-				// Define $urlwithroot
-				$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-				// Define link to login card
-				$appli=constant('DOL_APPLICATION_TITLE');
-				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-				{
-				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-				    if (preg_match('/\d\.\d/', $appli))
-				    {
-				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-				    }
-				    else $appli.=" ".DOL_VERSION;
-				}
-				else $appli.=" ".DOL_VERSION;
-
-				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaymentFailed");
-				$content="";
-				$content.=$langs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."\n";
-				$content.="\n";
-				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
-				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-				$ishtml=dol_textishtml($content);	// May contain urls
-
-				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-				$result=$mailfile->sendfile();
-				if ($result)
-				{
-					dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-				}
-				else
-				{
-					dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-				}
-			}
-        }
-    }
-    else
-    {
-        dol_print_error('', 'Session expired');
-    }
-}
-else
-{
-    // No TOKEN parameter in URL
-    dol_print_error('', 'No TOKEN parameter in URL');
-}
-
-print "\n</div>\n";
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 2f44c6390ff..7b57c315e34 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -146,7 +146,7 @@ $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
 if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 
-dol_syslog("Stripe IPN was called with event->type = ".$event->type);
+dol_syslog("***** Stripe IPN was called with event->type = ".$event->type);
 
 
 if ($event->type == 'payout.created') {
@@ -404,18 +404,7 @@ elseif ($event->type == 'charge.failed') {
     // TODO: Redirect to paymentko.php
 }
 elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated==true)) {
-
-    $fulltag=$event->data->object->metadata->FULLTAG;
-    dol_syslog("fulltag=".$fulltag);
-    // Save into $tmptag all metadata
-	$tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-    $stripe=new Stripe($db);
-    /*
-    $stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
-    $stripecu = $stripe->getStripeCustomerAccount($tmptag['CUS'], $servicestatus);		// Get thirdparty cu_...
-	$charge=$stripe->createPaymentStripe($event->data->object->amount/100, $event->data->object->currency, $origin, $item, $event->data->object->id, $stripecu, $stripeacc, $servicestatus);
-    */
+	// This event is deprecated.
 }
 
 http_response_code(200); // PHP 5.4 or greater
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
deleted file mode 100644
index 38f76865cb7..00000000000
--- a/htdocs/public/stripe/newpayment.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
- * Copyright (C) 2017       Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2017       Ferran Marcet   		<fmarcet@2byte.es>
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Page is called with payment parameters then called with action='dopayment', then called with action='charge' then redirect is done on urlok/jo
- */
-
-/**
- *  \file       htdocs/public/stripe/newpayment.php
- *  \ingroup    Stripe
- *  \brief      Page to do payment with Stripe
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
-
-$newurl = $_SERVER['REQUEST_URI'];
-$newurl = preg_replace('/\/stripe\/newpayment/', '/stripe/newpayment', $newurl);
-header("Location: ".$newurl.(preg_match('/\?/', $newurl)?'&':'?').'paymentmethod=stripe');
-exit;
diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php
deleted file mode 100644
index fa4eb5730eb..00000000000
--- a/htdocs/public/stripe/paymentko.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/stripe/paymentko.php
- *		\ingroup    core
- *		\brief      File to show page after a failed payment.
- *                  This page is called by payment system with url provided to it competed with parameter FULLTAG=xxx
- *                  More data like token are saved into session. This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='stripe';
-
-
-/*
- * Actions
- */
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
-
-if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
-{
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $paymentType        = $_SESSION['paymentType'];
-    $FinalPaymentAmt    = $_SESSION['FinalPaymentAmt'];
-    $ipaddress          = $_SESSION['ipaddress'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('STRIPE_PAYMENT_KO', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-    // Send an email
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))  $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    if ($sendemail)
-    {
-        // Get on url call
-    	$sendto=$sendemail;
-    	$from=$conf->global->MAILING_EMAIL_FROM;
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
-    	$content="";
-    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
-    	$content.="\n";
-    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
-    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-    	$result=$mailfile->sendfile();
-    	if ($result)
-    	{
-    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
-    	}
-    	else
-    	{
-    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
-    	}
-    }
-
-    unset($_SESSION['ipaddress']);
-}
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show ko message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
-
-$key='ONLINE_PAYMENT_MESSAGE_KO';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();
diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php
deleted file mode 100644
index 76df44be576..00000000000
--- a/htdocs/public/stripe/paymentok.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/stripe/paymentok.php
- *		\ingroup    core
- *		\brief      File to show page after a successful payment
- *                  This page is called by payment system with url provided to it completed with parameter FULLTAG=xxx
- *                  More data like token are saved into session. This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal"));
-
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-$source=GETPOST('source');
-$ref=GETPOST('ref');
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
-
-
-$ispaymentok = false;
-// If payment is ok
-$PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
-// If payment is ko
-$ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='stripe';
-
-
-/*
- * Actions
- */
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-$ispaymentok = true;    // We call this page if payment is ok
-if ($ispaymentok)
-{
-    // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-    $TRANSACTIONID      = $_SESSION['TRANSACTIONID'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('STRIPE_PAYMENT_OK', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-
-    print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-    print $langs->trans("ThisIsTransactionId", $TRANSACTIONID)."<br><br>\n";
-
-	$key='ONLINE_PAYMENT_MESSAGE_OK';
-	if (! empty($conf->global->$key)) print $conf->global->$key;
-
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    $tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-	// Send an email
-    if ($sendemail)
-	{
-		$sendto=$sendemail;
-		$from=$conf->global->MAILING_EMAIL_FROM;
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-		$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
-		$content="";
-		if (! empty($tmptag['MEM']))
-		{
-			$langs->load("members");
-			$url=$urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
-			$content.=$langs->trans("PaymentSubscription")."<br>\n";
-			$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-			$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		else
-		{
-			$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
-		}
-		$content.="<br>\n";
-		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-		$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-		$ishtml=dol_textishtml($content);	// May contain urls
-
-		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-		$result=$mailfile->sendfile();
-		if ($result)
-		{
-			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
-		}
-		else
-		{
-			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
-		}
-	}
-}
-
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 90d90b388ac..a9f0d9aed0b 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -486,7 +486,7 @@ if (empty($reshook))
 		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid', 'int'), 'alpha');
 		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid', 'int'), 'alpha');
 	}
-	https://dashboard.stripe.com/search?query=risk_level%3Ahighest&account=acct_1CVGWQLYhjvFj9Sz
+	
 	$id = $socid;
 	$upload_dir = $conf->societe->multidir_output[$object->entity];
 	$permissioncreate=$user->rights->societe->creer;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 9c0bc9ebae3..cff5f17494b 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -60,6 +60,7 @@ class Stripe extends CommonObject
 	public $type;
 
 	public $code;
+	public $declinecode;
 
 	public $message;
 
@@ -305,16 +306,18 @@ class Stripe extends CommonObject
 	 * @param   string  $currency_code                      Currency code
 	 * @param   string  $tag                                Tag
 	 * @param   string  $description                        Description
-	 * @param	Societe	$object							    Object to pay with Stripe
+	 * @param	mixed	$object							    Object to pay with Stripe
 	 * @param	string 	$customer							Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
 	 * @param	string	$key							    ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
 	 * @param	int		$status							    Status (0=test, 1=live)
 	 * @param	int		$usethirdpartyemailforreceiptemail	1=use thirdparty email for receipt
 	 * @param	int		$mode		                        automatic=automatic confirmation/payment when conditions are ok, manual=need to call confirm() on intent
 	 * @param   boolean $confirmnow                         false=default, true=try to confirm immediatly after create (if conditions are ok)
+	 * @param   string  $payment_method                     'pm_....' (if known)
+	 * @param   string  $off_session                        If we use an already known payment method to pay off line.
 	 * @return 	\Stripe\PaymentIntent|null 			        Stripe PaymentIntent or null if not found and failed to create
 	 */
-	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false)
+	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false, $payment_method = null, $off_session = 0)
 	{
 		global $conf;
 
@@ -335,7 +338,7 @@ class Stripe extends CommonObject
 		} elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
 		    $fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
 		}
-				if (! in_array($currency, $arrayzerounitcurrency)) $stripefee = round($fee * 100);
+				if (! in_array($currency_code, $arrayzerounitcurrency)) $stripefee = round($fee * 100);
 				else $stripefee = round($fee);
 
 		$paymentintent = null;
@@ -411,6 +414,16 @@ class Stripe extends CommonObject
     		// payment_method =
     		// payment_method_types = array('card')
             //var_dump($dataforintent);
+    		if ($off_session)
+    		{
+    		    unset($dataforintent['setup_future_usage']);
+    		    $dataforintent["off_session"] = true;
+    		}
+    		if (! is_null($payment_method))
+    		{
+    			$dataforintent["payment_method"] = $payment_method;
+    			$description.=' - '.$payment_method;
+    		}
 
     		if ($conf->entity!=$conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0)
     		{
@@ -434,7 +447,6 @@ class Stripe extends CommonObject
     				$paymentintent = \Stripe\PaymentIntent::create($dataforintent, array("idempotency_key" => "$description", "stripe_account" => $key));
     			    //$paymentintent = \Stripe\PaymentIntent::create($dataforintent, array("stripe_account" => $key));
     			}
-    			//var_dump($paymentintent->id);
 
     			// Store the payment intent
     			if (is_object($object))
@@ -479,19 +491,29 @@ class Stripe extends CommonObject
     			    $_SESSION["stripe_payment_intent"] = $paymentintent;
     			}
     		}
+    		catch(Stripe\Error\Card $e)
+    		{
+    			$error++;
+    			$this->error = $e->getMessage();
+    			$this->code = $e->getStripeCode();
+    			$this->declinecode = $e->getDeclineCode();
+    		}
     		catch(Exception $e)
     		{
     		    /*var_dump($dataforintent);
     		    var_dump($description);
     		    var_dump($key);
     		    var_dump($paymentintent);
-    		    var_dump($e->getMessage());*/
-                $error++;
+    		    var_dump($e->getMessage());
+    		    var_dump($e);*/
+    		    $error++;
     			$this->error = $e->getMessage();
+    			$this->code = '';
+    			$this->declinecode = '';
     		}
 		}
 
-		dol_syslog("getPaymentIntent return error=".$error, LOG_INFO, -1);
+		dol_syslog("getPaymentIntent return error=".$error." this->error=".$this->error, LOG_INFO, -1);
 
 		if (! $error)
 		{
@@ -654,7 +676,7 @@ class Stripe extends CommonObject
 	 * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
 	 * @param	int						$status							Status (0=test, 1=live)
 	 * @param	int						$createifnotlinkedtostripe		1=Create the stripe card and the link if the card is not yet linked to a stripe card
-	 * @return 	\Stripe\StripeCard|null 								Stripe Card or null if not found
+	 * @return 	\Stripe\StripeCard|\Stripe\PaymentMethod|null 			Stripe Card or null if not found
 	 */
 	public function cardStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
 	{
@@ -680,10 +702,24 @@ class Stripe extends CommonObject
 				{
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							$card = $cu->sources->retrieve($cardref);
+							if (! preg_match('/^pm_/', $cardref))
+							{
+								$card = $cu->sources->retrieve($cardref);
+							}
+							else
+							{
+								$card = \Stripe\PaymentMethod::retrieve($cardref);
+							}
 						} else {
-							//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
-							$card = $cu->sources->retrieve($cardref);
+							if (! preg_match('/^pm_/', $cardref))
+							{
+								//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
+								$card = $cu->sources->retrieve($cardref);
+							}
+							else {
+								//$card = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc));		// Don't know if this works
+								$card = \Stripe\PaymentMethod::retrieve($cardref);
+							}
 						}
 					}
 					catch(Exception $e)
@@ -707,12 +743,28 @@ class Stripe extends CommonObject
 
 					//$a = \Stripe\Stripe::getApiKey();
 					//var_dump($a);var_dump($stripeacc);exit;
-					dol_syslog("Try to create card dataforcard = ".json_encode($dataforcard));
+					dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							$card = $cu->sources->create($dataforcard);
+							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+							{
+								$card = $cu->sources->create($dataforcard);
+							}
+							else
+							{
+								// TODO
+								dol_syslog("Error: This case is not supported", LOG_ERR);
+							}
 						} else {
-							$card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
+							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+							{
+								$card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
+							}
+							else
+							{
+								// TODO
+								dol_syslog("Error: This case is not supported", LOG_ERR);
+							}
 						}
 
 						if ($card)
@@ -752,13 +804,12 @@ class Stripe extends CommonObject
 
 	/**
 	 * Create charge with public/payment/newpayment.php, stripe/card.php, cronjobs or REST API
-	 * This is using old Stripe API charge.
 	 *
 	 * @param	int 	$amount									Amount to pay
 	 * @param	string 	$currency								EUR, GPB...
 	 * @param	string 	$origin									Object type to pay (order, invoice, contract...)
 	 * @param	int 	$item									Object id to pay
-	 * @param	string 	$source									src_xxxxx or card_xxxxx
+	 * @param	string 	$source									src_xxxxx or card_xxxxx or pm_xxxxx
 	 * @param	string 	$customer								Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
 	 * @param	string 	$account								Stripe account ref 'acc_xxxxxxxxxxxxx' via  getStripeAccount()
 	 * @param	int		$status									Status (0=test, 1=live)
diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php
index 6811df8d589..41f802062a2 100644
--- a/htdocs/stripe/payment.php
+++ b/htdocs/stripe/payment.php
@@ -28,7 +28,7 @@
 /**
  *	\file       htdocs/stripe/payment.php
  *	\ingroup    stripe
- *	\brief      Payment page for customers invoices
+ *	\brief      Payment page for customers invoices. TODO Seems deprecated and bugged !
  */
 
 // Load Dolibarr environment
@@ -71,6 +71,7 @@ if ($user->societe_id > 0)
 }
 
 $object=new Facture($db);
+$stripe=new Stripe($db);
 
 // Load object
 if ($facid > 0)
@@ -78,9 +79,9 @@ if ($facid > 0)
 	$ret=$object->fetch($facid);
 }
 
-if (! empty($conf->stripe->enabled))
+if (empty($conf->stripe->enabled))
 {
-    access_forbidden();
+    accessforbidden();
 }
 
 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
@@ -306,7 +307,7 @@ if (empty($reshook))
 		elseif (preg_match('/src_/i', $source))
 		{
 
-		        $customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
+			$customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
 			$src = $customer2->sources->retrieve("$source");
 			if ($src->type=='card')
 			{
@@ -1082,7 +1083,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 if (! GETPOST('action'))
 {
-    if ($page == -1) $page = 0 ;
+    if ($page == -1 || empty($page)) $page = 0 ;
     $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
     $offset = $limit * $page ;
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 533608aa132..334fbe00ba1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -655,6 +655,14 @@ select.flat.selectlimit {
     max-width: 0;
     overflow: auto;
 }
+.divintdwithtwolinesmax {
+    width: 75px;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+
 .tablelistofcalendars {
 	margin-top: 25px !important;
 }
@@ -921,6 +929,7 @@ select.selectarrowonleft option {
     .maxwidth75onsmartphone { max-width: 50px; }
     .maxwidth100onsmartphone { max-width: 70px; }
     .maxwidth150onsmartphone { max-width: 120px; }
+    .maxwidth150onsmartphoneimp { max-width: 120px !important; }
     .maxwidth200onsmartphone { max-width: 200px; }
     .maxwidth300onsmartphone { max-width: 300px; }
     .maxwidth400onsmartphone { max-width: 400px; }
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index 681c90c75ae..4386d607050 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -9,7 +9,7 @@
     font-variant: normal;
     text-rendering: auto;
     line-height: 26px;
-	font-size: <?php echo $topMenuFontSize; ?>;
+	font-size: 1.5em;
     -webkit-font-smoothing: antialiased;
     text-align:center;
 	text-decoration:none;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ab965b1d3d3..4d0fbe1d09f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1083,6 +1083,7 @@ select.selectarrowonleft option {
     .maxwidth75onsmartphone { max-width: 50px; }
     .maxwidth100onsmartphone { max-width: 70px; }
     .maxwidth150onsmartphone { max-width: 120px; }
+    .maxwidth150onsmartphoneimp { max-width: 120px !important; }
     .maxwidth200onsmartphone { max-width: 200px; }
     .maxwidth300onsmartphone { max-width: 300px; }
     .maxwidth400onsmartphone { max-width: 400px; }