diff --git a/ChangeLog b/ChangeLog
index 69005b0c492..1235a85e097 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,9 +11,10 @@ NEW: complete_head_from_modules() in ldap_prepare_head()
 
 WARNING: 
 
-Following changes may create regression for some external modules, but were necessary to make Dolibarr better:
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * The methode "cloture" on contact were renamed into "closeAll".
-
+* The substitution key for reference of object is now __REF__ whatever is the object (it replaces __ORDERREF__, 
+  __PROPALREF__, ...)
 
 
 ***** ChangeLog for 6.0.0 compared to 5.0.* *****
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 80cc9b0856c..e0fa89d924d 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -366,7 +366,9 @@ if ($nboftargetok) {
 		}
 		else			# For a maintenance release
 		{
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			
 		}
 		print "\n";
 		if (! $ret)
diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php
index f745032f575..20173eb914a 100755
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -60,14 +60,14 @@ $db->begin();
 
 require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
-// Create invoice object
+// Create user object
 $obj = new User($db);
 //$obj->initAsSpecimen();
 
 $obj->login = 'ABCDEF';
 $obj->nom   = 'ABCDEF';
 
-// Create invoice
+// Create user
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {
diff --git a/dev/examples/code/get_contracts.php b/dev/examples/code/get_contracts.php
index 1262fe3eebd..fbe512300e8 100755
--- a/dev/examples/code/get_contracts.php
+++ b/dev/examples/code/get_contracts.php
@@ -67,7 +67,7 @@ $db->begin();
 
 require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
-// Create invoice object
+// Create contract object
 $obj = new Contrat($db);
 $obj->socid=$argv[1];
 
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index cf2b9080ee2..5c17f07183e 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -740,15 +740,6 @@ if ($id)
         print '</td>';
         print "</tr>";
 
-        if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates')
-        {
-        	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
-        	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-        	$tmp=FormMail::getAvailableSubstitKey('formemail');
-        	print implode(', ', $tmp);
-        	print '</td></tr>';
-        }
-
         $colspan=count($fieldlist)+3;
         if ($id == 4) $colspan++;
 
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 433448fa688..9a8a659db99 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
@@ -37,10 +37,10 @@ $langs->load("bills");
 $langs->load("admin");
 $langs->load("accountancy");
 
-// Security check
-if (empty($user->admin) && empty($user->rights->accounting->chartofaccount))
+// Security access
+if (empty($user->rights->accounting->chartofaccount))
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 $action = GETPOST('action', 'alpha');
@@ -53,13 +53,6 @@ $main_option = array (
 $model_option = array (
 		'ACCOUNTING_EXPORT_SEPARATORCSV',
 		'ACCOUNTING_EXPORT_DATE'
-		/*
-		'ACCOUNTING_EXPORT_PIECE',
-		'ACCOUNTING_EXPORT_GLOBAL_ACCOUNT',
-		'ACCOUNTING_EXPORT_LABEL',
-		'ACCOUNTING_EXPORT_AMOUNT',
-		'ACCOUNTING_EXPORT_DEVISE'
-		*/
 );
 
 /*
@@ -121,17 +114,13 @@ llxHeader();
 
 $form = new Form($db);
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+// $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
 
-$head = admin_accounting_prepare_head();
-
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'export', $langs->trans("Configuration"), -1, 'cron');
-
 $var = true;
 
 /*
@@ -245,8 +234,6 @@ if ($num2) {
 	print "</table>\n";
 }
 
-dol_fiche_end();
-
 print '<div class="center"><input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '" name="button"></div>';
 
 print '</form>';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index b6aceb52ad4..bc078c062c6 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -37,10 +37,9 @@ $langs->load("compta");
 $langs->load("bills");
 $langs->load("admin");
 $langs->load("accountancy");
-$langs->load("salaries");
 
-// Security check
-if (empty($user->admin))
+// Security access
+if (empty($user->rights->accounting->chartofaccount))
 {
 	accessforbidden();
 }
@@ -160,18 +159,13 @@ llxHeader();
 
 $form = new Form($db);
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+//$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
 
-$head = admin_accounting_prepare_head($accounting);
-
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'general', $langs->trans("Configuration"), -1, 'cron');
-
-
 // Default mode for calculating turnover (parameter ACCOUNTING_MODE)
 
 print '<table class="noborder" width="100%">';
@@ -287,18 +281,11 @@ foreach ($list as $key)
 
 print '</table>';
 
-
-
-
-dol_fiche_end();
-
 print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
 
 print '<br>';
 print '<br>';
 
-print '<div class="opacitymedium">'.$langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")).'</div>';
-
 print '<br>';
 print '</form>';
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index ee17976ca30..c7ebb5ed5af 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -114,11 +114,11 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 }
 
 // Mass actions
-$objectclass='Skeleton';
-$objectlabel='Skeleton';
-$permtoread = $user->rights->accounting->read;
-$permtodelete = $user->rights->accounting->delete;
-$uploaddir = $conf->accounting->dir_output;
+$objectclass='ExpenseReport';
+$objectlabel='ExpenseReport';
+$permtoread = $user->rights->expensereport->read;
+$permtodelete = $user->rights->expensereport->delete;
+$uploaddir = $conf->expensereport->dir_output;
 include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 if ($massaction == 'ventil') {
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index db4c631c0c9..63fd59f01e9 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -46,6 +46,10 @@ $mesg='';
 
 $adherentstatic=new Adherent($db);
 
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('adherent');
+
 
 /*
  * Actions
@@ -65,9 +69,14 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
     $sql.= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,";
     $sql.= " t.libelle as type,";
     $sql.= " c.code as country_code, c.label as country";
+    // Add fields from extrafields
+    foreach ($extrafields->attribute_label as $key => $val)
+        $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
     $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
+    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
     $sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
+    $sql.= " AND d.entity IN (".getEntity('adherent').")";
     if (is_numeric($foruserid)) $sql.=" AND d.rowid=".$foruserid;
     if ($foruserlogin) $sql.=" AND d.login='".$db->escape($foruserlogin)."'";
     $sql.= " ORDER BY d.rowid ASC";
@@ -84,9 +93,27 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
 
     		if ($objp->country == '-') $objp->country='';
 
+    		$adherentstatic->id=$objp->rowid;
     		$adherentstatic->lastname=$objp->lastname;
     		$adherentstatic->firstname=$objp->firstname;
 
+            // format extrafiled so they can be parsed in function complete_substitutions_array
+            if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+            {
+                $adherentstatic->array_options = array();
+                foreach($extrafields->attribute_label as $key => $val)
+                {
+                    $tmpkey='options_'.$key;
+                    if (!empty($objp->$tmpkey))
+                    {
+                        $adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
+                    }
+                    //if (!empty($objp->$key))
+                    //    $objp->array_options[$tmpkey] = $objp->$key;
+                    //$objp->array_options[$tmpkey] = $extrafields->showOutputField($key, $objp->$tmpkey, '', 1); //$objp->$tmpkey;
+                }
+            }
+
     		// List of values to scan for a replacement
             $substitutionarray = array (
                 '%ID%'=>$objp->rowid,
@@ -109,7 +136,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
                 '%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
                 '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/"
             );
-            complete_substitutions_array($substitutionarray, $langs);
+            complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
             // For business cards
             if (empty($mode) || $mode=='card' || $mode=='cardlogin')
@@ -123,7 +150,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
                 {
                     $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
                     if ($nb <= 0) $nb=1;  // Protection to avoid empty page
-                    
+
                     for($j=0;$j<$nb;$j++)
                     {
                         $arrayofmembers[]=array(
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index fa2c11849fb..50676e4c3af 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -165,6 +165,8 @@ if (! empty($triggers))
 		if ($module == 'shipping') $module = 'expedition_bon';
 		if ($module == 'member') $module = 'adherent';
 		if ($module == 'project') $module = 'projet';
+		if ($module == 'proposal_supplier') $module = 'supplier_proposal';
+
 		//print 'module='.$module.'<br>';
 		if (! empty($conf->$module->enabled))
 		{
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index a5e37f620f7..a999db51857 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -373,11 +373,12 @@ $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AG
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_FILTER_STATUS
+// TODO Remove to use the default generic feature
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
 print '<td align="right">'."\n";
-$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2);
+$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100');
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index aff21ce58e8..f437dc66975 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -211,11 +211,11 @@ class Dolistore
 
     		// add image or default ?
     		if ($product->id_default_image != '') {
-    			$image_url = DOL_URL_ROOT.'/dolistore/ajax/image.php?id_product='.$product->id.'&id_image='.$product->id_default_image;
+    			$image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.$product->id.'&id_image='.$product->id_default_image;
     			$images    = '<a href="'.$image_url.'" class="fancybox" rel="gallery'.$product->id.'" title="'.$product->name->language[$this->lang].', '.$langs->trans('Version').' '.$product->module_version.'">'.
     				'<img src="'.$image_url.'&quality=home_default" style="max-height:250px;max-width: 210px;" alt="" /></a>';
     		} else {
-    			$images = '<img src="'.DOL_URL_ROOT.'/dolistore/img/NoImageAvailable.png" />';
+    			$images = '<img src="'.DOL_URL_ROOT.'/admin/dolistore/img/NoImageAvailable.png" />';
     		}
 
     		// free or pay ?
diff --git a/htdocs/admin/dolistore/class/init.php b/htdocs/admin/dolistore/class/init.php
deleted file mode 100644
index 4a94e08002c..00000000000
--- a/htdocs/admin/dolistore/class/init.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<html><head><title>CRUD Tutorial - Customer's list</title></head><body>
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-* PrestaShop Webservice Library
-* @package PrestaShopWebservice
-*/
-// Here we define constants /!\ You need to replace this parameters
-//https://dolistorecatalogpublickey1234567@vmdevwww.dolistore.com/api/
-define('DEBUG', true);											// Debug mode
-define('PS_SHOP_PATH', 'https://www.dolistore.com/');			// Root path of your PrestaShop store
-define('PS_WS_AUTH_KEY', 'dolistorecatalogpublickey1234567');	// Auth key (Get it in your Back Office)
-require_once('./PSWebServiceLibrary.php');
-// Here we make the WebService Call
-try
-{
-	$webService = new PrestaShopWebservice(PS_SHOP_PATH, PS_WS_AUTH_KEY, DEBUG);
-
-	// Here we set the option array for the Webservice : we want customers resources
-	$opt['resource'] = 'categories';
-	$opt['id'] = '1';
-
-	// Call
-	$xml = $webService->get($opt);
-	// Here we get the elements from children of customers markup "customer"
-	$resources = $xml->categories->children();
-}
-catch (PrestaShopWebserviceException $e)
-{
-	// Here we are dealing with errors
-	$trace = $e->getTrace();
-	if ($trace[0]['args'][0] == 404) echo 'Bad ID';
-	else if ($trace[0]['args'][0] == 401) echo 'Bad auth key';
-	else echo 'Other error';
-}
-// We set the Title
-echo "<h1>Categories's List</h1>";
-echo '<table border="5">';
-// if $resources is set we can lists element in it otherwise do nothing cause there's an error
-if (isset($resources))
-{
-		echo '<tr><th>Id</th></tr>';
-		foreach ($resources as $resource)
-		{
-			// Iterates on the found IDs
-			echo '<tr><td>'.$resource->attributes().'</td></tr>';
-		}
-}
-echo '</table>';
-?>
-</body></html>
\ No newline at end of file
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 6b7d839592c..06f7af5b8d6 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -254,7 +254,7 @@ if ($action == 'reset' && $user->admin)
 
 $form = new Form($db);
 
-$morejs  = array("/admin/dolistore/js/dolistore.js.php");
+//$morejs  = array("/admin/dolistore/js/dolistore.js.php");
 $morecss = array("/admin/dolistore/css/dolistore.css");
 
 // Set dir where external modules are installed
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 4d1f0d571e1..cb6da443404 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -851,7 +851,8 @@ class ActionComm extends CommonObject
     }
 
     /**
-     *   Load all objects with filters
+     *   Load all objects with filters.
+     *   WARNING: This make a fetch on all records instead of making one request with a join.
      *
      *   @param		DoliDb	$db				Database handler
      *   @param		int		$socid			Filter by thirdparty
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b2b7e9cf5cf..c40192723a8 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1224,7 +1224,6 @@ else
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 
-
 			dol_fiche_head(null, '', '', -1);
 
 			print '<table class="border" width="100%">';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 18add332294..8fb2a102c22 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -125,7 +125,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) $action = '';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
@@ -638,16 +646,10 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-
-	/*
-	 * Send mail
-	 */
-
 	// Actions to send emails
     $actiontypecode='AC_OTH_AUTO';
 	$trigger_name='PROPAL_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromproposal';
+	$autocopy='MAIN_MAIL_AUTOCOPY_PROPOSAL_TO';
 	$trackid='pro'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
@@ -2361,123 +2363,13 @@ if ($action == 'create')
 		print '</div></div></div>';
 	}
 
-	/*
-	 * Action presend
- 	 */
-	if ($action == 'presend')
-	{
-		$object->fetch_projet();
+	// Presend form
+	$modelmail='propal_send';
+	$defaulttopic='SendPropalRef';
+	$diroutput = $conf->propal->dir_output;
+	$trackid = 'pro'.$object->id;
 
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendPropalByMail'));
-
-		dol_fiche_head('');
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='pro'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'pro'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST("sendto") ? GETPOST("sendto") : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = (! empty($conf->global->MAIN_EMAIL_USECCC) ? $conf->global->MAIN_EMAIL_USECCC : false);
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendPropalRef', '__PROPREF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendPropalRef', '__PROPREF__ (__REFCLIENT__)');
-		}
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit['__PROPREF__'] = $object->ref; // For backward compatibility
-
-		// Find the good contact adress
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0) {
-			foreach ($contactarr as $contact) {
-				if ($contact ['libelle'] == $langs->trans('TypeContact_propal_external_CUSTOMER')) {	// TODO Use code and not label
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'propal_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['id'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e0f1caafc81..41002eb9e71 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -96,8 +96,8 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='p.ref';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$contextpage='proposallist';
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'proposallist';
 
 // Security check
 $module='propal';
@@ -413,6 +413,7 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 040b1e200d8..4c49cef6820 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -118,16 +118,11 @@ if (empty($reshook))
 {
 	if ($cancel)
 	{
-		if ($action != 'addlink' && $action != 'updateline')
+		if (! empty($backtopage))
 		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/commande/list.php',1);
-			header("Location: ".$urltogo);
+			header("Location: ".$backtopage);
 			exit;
 		}
-		if ($id > 0 || ! empty($ref)) {
-		    $ret = $object->fetch($id,$ref);
-		    $object->fetch_thirdparty();
-        }
 		$action='';
 	}
 
@@ -1256,13 +1251,13 @@ if (empty($reshook))
 		exit();
 	}
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
 	$trigger_name='ORDER_SENTBYMAIL';
 	$paramname='id';
-	$mode='emailfromorder';
+	$autocopy='MAIN_MAIL_AUTOCOPY_ORDER_TO';		// used to know the automatic BCC to add
 	$trackid='ord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
@@ -2596,134 +2591,13 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '</div></div></div>';
 		}
 
-		/*
-		 * Action presend
-		 */
-		if ($action == 'presend')
-		{
-			$object->fetch_projet();
+		// Presend form
+		$modelmail='order_send';
+		$defaulttopic='SendOrderRef';
+		$diroutput = $conf->commande->dir_output;
+		$trackid = 'ord'.$object->id;
 
-			$ref = dol_sanitizeFileName($object->ref);
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->thirdparty->default_lang;
-
-			if (!empty($newlang))
-			{
-				$outputlangs = new Translate('', $conf);
-				$outputlangs->setDefaultLang($newlang);
-				$outputlangs->load('commercial');
-			}
-
-			// Show email form
-
-			// By default if $action=='presend'
-			$titreform='SendOrderByMail';
-			$topicmail='';
-			if (empty($object->ref_client)) {
-			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-			} else if (! empty($object->ref_client)) {
-			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-			}
-			$action='send';
-			$modelmail='order_send';
-
-			// Build document if it not exists
-			if (! $file || ! is_readable($file)) {
-				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result <= 0) {
-					dol_print_error($db, $object->error, $object->errors);
-					exit();
-				}
-				$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-				$file = $fileparams['fullname'];
-			}
-
-			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-			print '<div class="clearboth"></div>';
-			print '<br>';
-			print load_fiche_titre($langs->trans($titreform));
-
-			dol_fiche_head('');
-
-			// Cree l'objet formulaire mail
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-            $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-            if($formmail->fromtype === 'user'){
-                $formmail->fromid = $user->id;
-
-            }
-			$formmail->trackid='ord'.$object->id;
-			if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-			{
-				include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-			}
-			$formmail->withfrom = 1;
-			$liste = array();
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-				$liste [$key] = $value;
-			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-			$formmail->withtocc = $liste;
-			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-			$formmail->withtopic = $topicmail;
-			$formmail->withfile = 2;
-			$formmail->withbody = 1;
-			$formmail->withdeliveryreceipt = 1;
-			$formmail->withcancel = 1;
-			// Tableau des substitutions
-			$formmail->setSubstitFromObject($object);
-			$formmail->substit ['__ORDERREF__'] = $object->ref;
-
-			$custcontact = '';
-			$contactarr = array();
-			$contactarr = $object->liste_contact(- 1, 'external');
-
-			if (is_array($contactarr) && count($contactarr) > 0)
-			{
-				foreach ($contactarr as $contact)
-				{
-					if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-						$contactstatic = new Contact($db);
-						$contactstatic->fetch($contact ['id']);
-						$custcontact = $contactstatic->getFullName($langs, 1);
-					}
-				}
-
-				if (! empty($custcontact)) {
-					$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-				}
-			}
-
-			// Tableau des parametres complementaires
-			$formmail->param['action'] = $action;
-			$formmail->param['models'] = $modelmail;
-			$formmail->param['models_id']=GETPOST('modelmailselected','int');
-			$formmail->param['orderid'] = $object->id;
-			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-			// Init list of files
-			if (GETPOST("mode") == 'init') {
-				$formmail->clear_attached_files();
-				$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-			}
-
-			// Show form
-			print $formmail->get_form();
-
-			dol_fiche_end();
-		}
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
 }
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ea1f93d22fb..927460c511a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -83,6 +83,7 @@ $result = restrictedArea($user, 'commande', $id,'');
 
 $diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
+// Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -206,7 +207,8 @@ if (empty($reshook))
     $permtoread = $user->rights->commande->lire;
     $permtodelete = $user->rights->commande->supprimer;
     $uploaddir = $conf->commande->dir_output;
-	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    $trigger_name='ORDER_SENTBYMAIL';
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// TODO Move this into mass action include
     if ($massaction == 'confirm_createbills') {
@@ -994,8 +996,6 @@ if ($resql)
     {
         $obj = $db->fetch_object($resql);
 
-        print '<tr class="oddeven">';
-
         $notshippable=0;
         $warning = 0;
         $text_info='';
@@ -1018,6 +1018,8 @@ if ($resql)
         $generic_commande->total_tva = $obj->total_tva;
         $generic_commande->total_ttc = $obj->total_ttc;
 
+        print '<tr class="oddeven">';
+
         // Ref
         if (! empty($arrayfields['c.ref']['checked']))
         {
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 7c94e03e339..b32d4ea938e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -145,7 +145,7 @@ if ($action == 'add')
         if ($id > 0)
         {
             // Category association
-            $categories = GETPOST('categories');
+            $categories = GETPOST('categories', 'array');
             $object->setCategories($categories);
 
             $_GET["id"]=$id;            // Force chargement page en mode visu
@@ -239,7 +239,7 @@ if ($action == 'update')
         if ($result >= 0)
         {
             // Category association
-            $categories = GETPOST('categories');
+            $categories = GETPOST('categories', 'array');
             $object->setCategories($categories);
 
             $_GET["id"]=$_POST["id"];   // Force chargement page en mode visu
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index a25447da224..b575180feed 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1255,6 +1255,7 @@ class Account extends CommonObject
         $label = '<u>' . $langs->trans("ShowAccount") . '</u>';
         $label .= '<br><b>' . $langs->trans('BankAccount') . ':</b> ' . $this->label;
         $label .= '<br><b>' . $langs->trans('AccountNumber') . ':</b> ' . $this->number;
+        $label .= '<br><b>' . $langs->trans("AccountCurrency") . ':</b> ' . $this->currency_code;
         if (! empty($conf->accounting->enabled))
         {
             include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 1e387bcd3fa..a01f2de0f31 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -132,7 +132,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel) $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
@@ -1957,20 +1965,17 @@ if (empty($reshook))
 		exit();
 	}
 
-
-	/*
-	 * Send mail
-	 */
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
 	if (empty($id)) $id=$facid;
 	$trigger_name='BILL_SENTBYMAIL';
 	$paramname='id';
-	$mode='emailfrominvoice';
+	$autocopy='MAIN_MAIL_AUTOCOPY_INVOICE_TO';
 	$trackid='inv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-
     // Actions to build doc
     $upload_dir = $conf->facture->dir_output;
     $permissioncreate=$user->rights->facture->creer;
@@ -2003,8 +2008,6 @@ if (empty($reshook))
 			$action = 'edit_extras';
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer) {
 		if ($action == 'addcontact') {
 			$result = $object->fetch($id);
@@ -4335,143 +4338,15 @@ else if ($id > 0 || ! empty($ref))
 
 		print '</div></div></div>';
 	}
-	else
-	{
-		/*
-		 * Action presend (or prerelance)
-		 */
 
-		$object->fetch_projet();
 
-		// By default if $action=='presend'
-		$titreform = 'SendBillByMail';
-		$topicmail = 'SendBillRef';
-		$modelmail = 'facture_send';
+	// Presend form
+	$modelmail='facture_send';
+	$defaulttopic='SendBillRef';
+	$diroutput = $conf->facture->dir_output;
+	$trackid = 'inv'.$object->id;
 
-		if ($action == 'prerelance') 		// For backward compatibility
-		{
-			$titrefrom = 'SendReminderBillByMail';
-			$topicmail = 'SendReminderBillRef';
-			$modelmail = 'facture_relance';
-			$action = 'relance';
-		} else
-			$action = 'send';
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('bills');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model','alpha') ? GETPOST('model','alpha') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans($titreform));
-
-		// Cree l'objet formulaire mail
-		dol_fiche_head();
-
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype','alpha')?GETPOST('fromtype','alpha'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='inv'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'inv'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
-			$liste [$key] = $value;
-		}
-		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste; // List suggested for send to
-		$formmail->withtocc = $liste; // List suggested for CC
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->transnoentities($topicmail, '__REF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->transnoentities($topicmail, '__REF__ (__REFCLIENT__)');
-		}
-
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object, $outputlangs);
-		$formmail->substit['__INVREF__'] = $object->ref;
-
-		// Find the good contact adress
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0) {
-			foreach ($contactarr as $contact) {
-				if ($contact['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {	// TODO Use code and not label
-
-					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires du post
-		$formmail->param['action'] = $action;
-		$formmail->param['models'] = $modelmail;
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['facid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 9dd6b8adbe1..5a59b61e8a3 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -110,8 +110,8 @@ if (! $sortfield) $sortfield='f.datef';
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$contextpage='invoicelist';
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'invoicelist';
 
 // Security check
 $fieldid = (! empty($ref)?'facnumber':'rowid');
@@ -606,6 +606,7 @@ if ($resql)
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 7dffd99f8bf..2d6f728b502 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -224,7 +224,7 @@ if (empty($reshook))
                 $action = 'create';
 			} else {
 				// Categories association
-				$contcats = GETPOST( 'contcats', 'array' );
+				$contcats = GETPOST( 'contcats', 'array');
 				$object->setCategories($contcats);
 			}
         }
@@ -383,7 +383,7 @@ if (empty($reshook))
 				$db->query( $sql );
 
 				// Then we add the associated categories
-				$categories = GETPOST( 'contcats', 'array' );
+				$categories = GETPOST( 'contcats', 'array');
 				$object->setCategories($categories);
 
                 $object->old_lastname='';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 0e8722d20b8..16c843466f9 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2242,7 +2242,6 @@ else
 			$formmail->withdeliveryreceipt = 1;
 			$formmail->withcancel = 1;
 			// Array of substitutions
-			$formmail->withsubstit='AvailableVariables';
 			$formmail->setSubstitFromObject($object);
 			$datenextexpiration='';
 			foreach($object->lines as $line)
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 76b710bc5c8..cfc4d07ab1d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -53,6 +53,7 @@ $search_state=trim(GETPOST("search_state"));
 $search_country=GETPOST("search_country",'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $search_contract=GETPOST('search_contract');
+$search_ref_customer=GETPOST('search_ref_customer','alpha');
 $search_ref_supplier=GETPOST('search_ref_supplier','alpha');
 $sall=GETPOST('sall', 'alphanohtml');
 $search_status=GETPOST('search_status');
@@ -161,6 +162,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_type='';
 	$search_country='';
 	$search_contract="";
+	$search_ref_customer="";
 	$search_ref_supplier="";
     $search_user='';
     $search_sale='';
@@ -245,6 +247,7 @@ else if ($year > 0)
 }
 if ($search_name) $sql .= natural_search('s.nom', $search_name);
 if ($search_contract) $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
+if (!empty($search_ref_customer)) $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
 if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
 if ($search_sale > 0)
 {
@@ -431,13 +434,13 @@ if ($resql)
     if (! empty($arrayfields['c.ref_customer']['checked']))
     {
         print '<td class="liste_titre">';
-        print '<input type="text" class="flat" size="6" name="search_ref_customer value="'.dol_escape_htmltag($search_ref_customer).'">';
+        print '<input type="text" class="flat" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
         print '</td>';
     }
     if (! empty($arrayfields['c.ref_supplier']['checked']))
     {
         print '<td class="liste_titre">';
-        print '<input type="text" class="flat" size="6" name="search_ref_supplier value="'.dol_escape_htmltag($search_ref_supplier).'">';
+        print '<input type="text" class="flat" size="6" name="search_ref_supplier" value="'.dol_escape_htmltag($search_ref_supplier).'">';
         print '</td>';
     }
     if (! empty($arrayfields['s.nom']['checked']))
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index e5a5c21c00b..9d1db86ded6 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -285,7 +285,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 llxHeader(null, $langs->trans("Services"));
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($search_contract) $param.='&amp;search_contract='.urlencode($search_contract);
 if ($search_name)      $param.='&amp;search_name='.urlencode($search_name);
@@ -326,6 +326,7 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $title=$langs->trans("ListOfServices");
 if ($mode == "0") $title=$langs->trans("ListOfInactiveServices");	// Must use == "0"
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index 7c25fbe7981..6a2d7196d0f 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -28,7 +28,7 @@
 // $cancel must be defined
 // $id or $ref must be defined (object is loaded in this file with fetch)
 
-if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && empty($cancel))
+if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
 {
     $ret = $object->fetch($id, $ref);
     if ($ret > 0)
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 4c3fe6af317..b17c047860a 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -64,36 +64,63 @@ if (! $error && $massaction == 'confirm_presend')
     $langs->load("mails");
     include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    if (!$error && !isset($user->email))
-    {
-        $error++;
-        setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
-    }
+    $listofobjectid=array();
+    $listofobjectthirdparties=array();
+    $listofobjectref=array();
 
     if (! $error)
     {
         $thirdparty=new Societe($db);
+        if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
+
         $objecttmp=new $objectclass($db);
-        $listofobjectid=array();
-        $listofobjectthirdparties=array();
-        $listofobjectref=array();
         foreach($toselect as $toselectid)
         {
-            $objecttmp=new $objectclass($db);	// must create new instance because instance is saved into $listofobjectref array for future use
+            $objecttmp=new $objectclass($db);	// we must create new instance because instance is saved into $listofobjectref array for future use
             $result=$objecttmp->fetch($toselectid);
             if ($result > 0)
             {
                 $listofobjectid[$toselectid]=$toselectid;
                 $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
                 if ($objecttmp->element == 'societe') $thirdpartyid=$objecttmp->id;
+                if ($objecttmp->element == 'expensereport') $thirdpartyid=$objecttmp->fk_user_author;
                 $listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
                 $listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
             }
         }
-        //var_dump($listofobjectthirdparties);exit;
+    }
 
+    // Check mandatory parameters
+    if (empty($user->email))
+    {
+        $error++;
+        setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
+        $massaction='presend';
+    }
 
-        // Loop on each thirdparty
+    $receiver=$_POST['receiver'];
+    if (! is_array($receiver))
+    {
+    	if (empty($receiver) || $receiver == '-1') $receiver=array();
+    	else $receiver=array($receiver);
+    }
+    if (count($receiver) == 0 && count($listofobjectthirdparties) == 1)	// if only one recipient, receiver is mandatory
+    {
+     	$error++;
+       	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
+       	$massaction='presend';
+    }
+
+    if (! GETPOST('subject','none'))
+    {
+    	$error++;
+    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTopic")), null, 'warnings');
+    	$massaction='presend';
+    }
+
+    // Loop on each recipient/thirdparty
+    if (! $error)
+    {
         foreach ($listofobjectthirdparties as $thirdpartyid)
         {
             $result = $thirdparty->fetch($thirdpartyid);
@@ -109,12 +136,6 @@ if (! $error && $massaction == 'confirm_presend')
             $sendtoid = array();
 
             // Define $sendto
-            $receiver=$_POST['receiver'];
-            if (! is_array($receiver))
-            {
-            	if ($receiver == '-1') $receiver=array();
-            	else $receiver=array($receiver);
-            }
             $tmparray=array();
             if (trim($_POST['sendto']))
             {
@@ -203,8 +224,17 @@ if (! $error && $massaction == 'confirm_presend')
                 // Test recipient
 	            if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
 	            {
-	             	$object->fetch_thirdparty();
-	               	$sendto = $object->thirdparty->email;
+	            	if ($object->element == 'expensereport')
+	            	{
+						$fuser = new User($db);
+						$fuser->fetch($object->fk_user_author);
+						$sendto = $fuser->email;
+	            	}
+	            	else
+	            	{
+	            		$object->fetch_thirdparty();
+	               		$sendto = $object->thirdparty->email;
+	            	}
 	            }
 
 	            if (empty($sendto))
@@ -357,18 +387,32 @@ if (! $error && $massaction == 'confirm_presend')
                             $object->fk_element		= $objid;
                             $object->elementtype	= $object->element;
 
-                            // Appel des triggers
-                            include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-                            $interface=new Interfaces($db);
-                            $result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf);
-                            if ($result < 0) { $error++; $errors=$interface->errors; }
-                            // Fin appel triggers
+                            $triggername = strtoupper(get_class($object)) .'_SENTBYMAIL';
+                            if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
+                            if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
+                            if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
+                            if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYEMAIL';
+                            if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
+                            if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+                            if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
+                            if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
 
-                            if ($error)
+                            if (! empty($trigger_name))
                             {
-                                setEventMessages($db->lasterror(), $errors, 'errors');
-                                dol_syslog("Error in trigger BILL_SENTBYMAIL ".$db->lasterror(), LOG_ERR);
+	                            // Appel des triggers
+	                            include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+	                            $interface=new Interfaces($db);
+	                            $result=$interface->run_triggers($trigger_name, $object, $user, $langs, $conf);
+	                            if ($result < 0) { $error++; $errors=$interface->errors; }
+	                            // Fin appel triggers
+
+	                            if ($error)
+	                            {
+	                                setEventMessages($db->lasterror(), $errors, 'errors');
+	                                dol_syslog("Error in trigger ".$trigger_name.' '.$db->lasterror(), LOG_ERR);
+	                            }
                             }
+
                             $nbsent++;
                         }
                     }
@@ -407,10 +451,10 @@ if (! $error && $massaction == 'confirm_presend')
             //setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
             setEventMessages($resaction, null, 'warnings');
         }
-    }
 
-    $action='list';
-    $massaction='';
+        $action='list';
+    	$massaction='';
+    }
 }
 
 if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search'))
@@ -592,7 +636,7 @@ if ($action == 'remove_file')
     $action='';
 }
 
-// Validate  records
+// Validate records
 if (! $error && $massaction == 'validate' && $permtocreate)
 {
 	if ($object->element == 'invoice_supplier' && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
@@ -664,8 +708,19 @@ if (! $error && $massaction == 'delete' && $permtodelete)
     	$result=$objecttmp->fetch($toselectid);
         if ($result > 0)
         {
+        	// Refuse deletion for some status ?
+        	/*
+       		if ($objectclass == 'Facture' && $objecttmp->status == Facture::STATUS_DRAFT)
+       		{
+       			$langs->load("errors");
+       			$nbignored++;
+       			$resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$object->ref).'</div><br>';
+       			continue;
+       		}*/
+
             if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
             else $result = $objecttmp->delete($user);
+
             if ($result <= 0)
             {
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 18c951c7763..144cba07779 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -24,7 +24,7 @@
 // $mysoc must be defined
 // $id must be defined
 // $paramname must be defined
-// $mode must be defined
+// $mode must be defined (used to know the automatic BCC to add)
 // $trigger_name must be set (can be '')
 // $actiontypecode can be set
 // $object and $uobject may be defined
@@ -268,12 +268,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
 
 			$sendtobcc= GETPOST('sendtoccc');
-			if ($mode == 'emailfromproposal')         $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
-			if ($mode == 'emailfromorder')            $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
-			if ($mode == 'emailfrominvoice')          $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
-			if ($mode == 'emailfromsupplierproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
-			if ($mode == 'emailfromsupplierorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
-			if ($mode == 'emailfromsupplierinvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
+			// Autocomplete the $sendtobcc
+			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
+			if (! empty($autocopy))
+			{
+				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
+			}
 
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 02b1d1880c8..71a9a4e3125 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -77,7 +77,6 @@ class box_activity extends ModeleBoxes
         include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $totalMnt = 0;
         $totalnb = 0;
         $line = 0;
         $cachetime = 3600;
@@ -95,8 +94,6 @@ class box_activity extends ModeleBoxes
         // compute the year limit to show
         $tmpdate= dol_time_plus_duree(dol_now(), -1*$nbofperiod, "m");
 
-        $cumuldata = array();
-
 
         // list the summary of the propals
         if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
@@ -146,11 +143,10 @@ class box_activity extends ModeleBoxes
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	$cumuldata=array_merge($cumuldata, $data);
         	if (! empty($data))
         	{
         		$j=0;
-        		while ($line < count($cumuldata))
+        		while ($j < count($data))
         		{
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
@@ -176,7 +172,6 @@ class box_activity extends ModeleBoxes
         			'td' => 'class="right"',
         			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
         			);
-        			$totalMnt += $data[$j]->Mnttot;
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
         			'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
@@ -231,10 +226,9 @@ class box_activity extends ModeleBoxes
                 $data = dol_readcachefile($cachedir, $filename);
             }
 
-            $cumuldata=array_merge($cumuldata, $data);
             if (! empty($data)) {
                 $j=0;
-                while ($line < count($cumuldata)) {
+                while ($j < count($data)) {
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="left" width="16"',
                         'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut,
@@ -259,7 +253,6 @@ class box_activity extends ModeleBoxes
                         'td' => 'class="right"',
                         'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
                     );
-                    $totalMnt += $data[$j]->Mnttot;
                     $this->info_box_contents[$line][4] = array(
                         'td' => 'align="right" width="18"',
                         'text' => $commandestatic->LibStatut($data[$j]->fk_statut,0,3),
@@ -290,11 +283,11 @@ class box_activity extends ModeleBoxes
         		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
         		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
         		$sql.= ")";
-        		$sql.= " WHERE f.entity = ".$conf->entity;
+        		$sql.= " WHERE f.entity IN (".getEntity('facture').')';
         		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
         		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
         		$sql.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND paye=1";
+        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=1";
         		$sql.= " GROUP BY f.fk_statut";
         		$sql.= " ORDER BY f.fk_statut DESC";
 
@@ -317,10 +310,9 @@ class box_activity extends ModeleBoxes
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	$cumuldata=array_merge($cumuldata, $data);
         	if (! empty($data)) {
         		$j=0;
-        		while ($line < count($cumuldata)) {
+        		while ($j < count($data)) {
         			$billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
@@ -347,10 +339,8 @@ class box_activity extends ModeleBoxes
         			);
 
         			// We add only for the current year
-        			if ($data[$j]->annee == date("Y")) {
-        				$totalnb += $data[$j]->nb;
-        				$totalMnt += $data[$j]->Mnttot;
-        			}
+       				$totalnb += $data[$j]->nb;
+
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
         			'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
@@ -371,12 +361,13 @@ class box_activity extends ModeleBoxes
 
         	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 
+        	$data = array();
         	if ($refresh) {
         		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
         		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		$sql.= " WHERE f.entity = ".$conf->entity;
+        		$sql.= " WHERE f.entity IN (".getEntity('facture').')';
         		$sql.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND paye=0";
+        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=0";
         		$sql.= " GROUP BY f.fk_statut";
         		$sql.= " ORDER BY f.fk_statut DESC";
 
@@ -399,11 +390,11 @@ class box_activity extends ModeleBoxes
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	$cumuldata=array_merge($cumuldata, $data);
         	if (! empty($data)) {
-        		$j=0;
+        		$alreadypaid=-1;
 
-        		while ($line < count($cumuldata)) {
+        		$j=0;
+        		while ($j < count($data)) {
         			$billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
@@ -428,10 +419,9 @@ class box_activity extends ModeleBoxes
         			'td' => 'class="right"',
         			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
         			);
-        			$totalMnt += $objp->Mnttot;
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
-        			'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3),
+        			'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3, $alreadypaid),
         			);
         			$line++;
         			$j++;
@@ -441,11 +431,6 @@ class box_activity extends ModeleBoxes
         			'td' => 'align="center"',
         			'text'=>$langs->trans("NoRecordedInvoices"),
         			);
-        	} else {
-        		$this->info_box_contents[0][0] = array(
-        		'td' => '',
-        		'maxlength'=>500, 'text' => ($db->error().' sql='.$sql),
-        		);
         	}
         }
 
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 4b6d70b1366..6bbde52cb58 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -51,7 +51,7 @@ abstract class CommonInvoice extends CommonObject
     const TYPE_DEPOSIT = 3;
 
     /**
-     * Proforma invoice. 
+     * Proforma invoice.
      * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
      */
     const TYPE_PROFORMA = 4;
@@ -89,7 +89,7 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	const STATUS_ABANDONED = 3;
 
-	
+
 	/**
 	 * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
 	 *  This does not include open direct debit requests.
@@ -141,7 +141,7 @@ abstract class CommonInvoice extends CommonObject
 			return -1;
 		}
 	}
-	
+
 	/**
 	 *    	Return amount (with tax) of all deposits invoices used by invoice.
      *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
@@ -154,11 +154,11 @@ abstract class CommonInvoice extends CommonObject
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 	    {
 	        // TODO
-	       return 0;     
+	       return 0;
 	    }
-	    
+
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-	
+
 	    $discountstatic=new DiscountAbsolute($this->db);
 	    $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
 	    if ($result >= 0)
@@ -185,9 +185,9 @@ abstract class CommonInvoice extends CommonObject
 	        // TODO
 	        return 0;
 	    }
-	     
+
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-	
+
 	    $discountstatic=new DiscountAbsolute($this->db);
 	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
 	    if ($result >= 0)
@@ -200,7 +200,7 @@ abstract class CommonInvoice extends CommonObject
 	        return -1;
 	    }
 	}
-	
+
 	/**
 	 *	Renvoie tableau des ids de facture avoir issus de la facture
 	 *
@@ -309,7 +309,7 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param    	int  	$paye          	Status field paye
 	 *	@param      int		$status        	Id status
 	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
-	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
 	 *	@param		int		$type			Type invoice
 	 *	@return     string        			Libelle du statut
 	 */
@@ -418,7 +418,7 @@ abstract class CommonInvoice extends CommonObject
 				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
 				if (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
 				if (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7');
-				if ($alreadypaid <= 0) 
+				if ($alreadypaid <= 0)
 				{
 				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
 				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
@@ -497,13 +497,13 @@ abstract class CommonInvoice extends CommonObject
 		}
 		elseif($cdr_type == 2 && !empty($cdr_nbjour)) // Application de la règle, le N du mois courant ou suivant
 		{
-			
+
 			$date_piece = dol_mktime(0,0,0,date('m', $this->date),date('d', $this->date),date('Y', $this->date)); // Sans les heures minutes et secondes
 			$date_lim_current = dol_mktime(0,0,0,date('m', $this->date),$cdr_nbjour,date('Y', $this->date)); // Sans les heures minutes et secondes
 			$date_lim_next = strtotime(date('Y-m-d', $date_lim_current).' +1month');
-			
+
 			$diff = $date_piece - $date_lim_current;
-			
+
 			if($diff < 0) $datelim = $date_lim_current;
 			else $datelim = $date_lim_next;
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e37932ea635..0260effebc6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3392,7 +3392,7 @@ class Form
                 require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
                 $bankstatic=new Account($this->db);
                 $bankstatic->fetch($selected);
-                print $this->textwithpicto($bankstatic->getNomUrl(1),$langs->trans("AccountCurrency").'&nbsp;'.$bankstatic->currency_code);
+                print $bankstatic->getNomUrl(1);
             } else {
                 print "&nbsp;";
             }
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 579520f7647..f09dab9be38 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -250,12 +250,10 @@ class FormActions
         		}
         		print '</td>';
         		print '<td>';
-        		if (! empty($action->author->id))
+        		if (! empty($action->userownerid))
         		{
-        			$userstatic->id = $action->author->id;
-        			$userstatic->firstname = $action->author->firstname;
-        			$userstatic->lastname = $action->author->lastname;
-        			print $userstatic->getNomUrl(1, '', 0, 0, 16, 0, '', '');
+        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
         		}
         		print '</td>';
         		print '<td align="right">';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index daf2f9b819f..366247560ac 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -343,7 +343,7 @@ class FormMail extends Form
         	if (count($modelmail_array)>0)
         	{
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-        	    $out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1);
+        	    $out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
 	        	$out.= ' &nbsp; ';
 	        	$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
@@ -370,7 +370,7 @@ class FormMail extends Form
         	$out.= '<table class="border" width="100%">'."\n";
 
         	// Substitution array
-        	if (! empty($this->withsubstit))
+        	if (! empty($this->withsubstit))		// Unset of set ->withsubstit=0 to disable this.
         	{
         		$out.= '<tr><td colspan="2" align="right">';
         		//$out.='<div class="floatright">';
@@ -380,7 +380,7 @@ class FormMail extends Form
         			$help.=$key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
         		}
         		if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $help, 1, 'help', '', 0, 2, 'substittooltip');	// Old usage
-        		else $out.= $form->textwithpicto($langs->trans($this->withsubstit), $help, 1, 'help', '', 0, 2, 'substittooltip');																// New usage
+        		else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $help, 1, 'help', '', 0, 2, 'substittooltip');															// New usage
         		$out.= "</td></tr>\n";
         		//$out.='</div>';
         	}
@@ -746,24 +746,31 @@ class FormMail extends Form
 				}
 
         		// Complete substitution array
-        		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
+        		$paymenturl='';
+        		if (! empty($conf->global->PAYMENT_ADD_PAYMENT_URL)		// Option to enable to add online link into __PERSONALIZED__
+        			|| (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
+        		)
         		{
-        			require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-
-        			$langs->load('paypal');
-
-        			// Set the paypal message and url link into __PERSONALIZED__ key
-        			if ($this->param["models"]=='order_send')
+        			if (empty($this->substit['__REF__']))
         			{
-        				$url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']?$this->substit['__ORDERREF__']:$this->substit['__REF__']);
-        				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
+        				//$paymenturl='LinkToPayOnlineNotAvailableInThisContext';
+        				$paymenturl='';
         			}
-        			if ($this->param["models"]=='facture_send')
+        			else
         			{
-        				$url=getPaypalPaymentUrl(0,'invoice',$this->substit['__REF__']);
-        				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
+	        			// Set the online payment message and url link into __PERSONALIZED__ key
+	        			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+	        			$langs->load('paypal');
+	        			$typeforonlinepayment='free';
+	        			if ($this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
+	        			if ($this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
+	       				$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
+	       				//$paymenturl=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
+	       				$paymenturl=$url;
         			}
         		}
+        		$this->substit['__PERSONALIZED__']=$paymenturl;
+        		$this->substit['__ONLINE_PAYMENT_URL__']='YY'.$paymenturl;
 
                 //Add lines substitution key from each line
                 $lines = '';
@@ -849,7 +856,7 @@ class FormMail extends Form
         	{
 	        	$out.= '<script type="text/javascript" language="javascript">';
 		        $out.= 'jQuery(document).ready(function () {';
-				$out.= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is calle at every key pressed ! */
+				$out.= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
 	    						var code = e.keyCode || e.which;
 	    						if (code == 13) {
 	        						e.preventDefault();
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 2015d4e47af..94e60ba8082 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -130,7 +130,7 @@ function limitChars(textarea, limit, infodiv)
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if ($this->withsubstit)
+        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
             $help="";
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 0fccf6ccd9a..b0b6dc6855c 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,40 +23,6 @@
  * 	\brief		Library of accountancy functions
  */
 
-/**
- *	Prepare array with list of admin tabs
- *
- *	@param	AccountingAccount	$object		Object instance we show card
- *	@return	array							Array of tabs to show
- */
-function admin_accounting_prepare_head(AccountingAccount $object=null)
-{
-	global $langs, $conf;
-
-	$h = 0;
-	$head = array ();
-
-	$head[$h][0] = dol_buildpath('/accountancy/admin/index.php', 1);
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h ++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/export.php';
-	$head[$h][1] = $langs->trans("ExportOptions");
-	$head[$h][2] = 'export';
-	$h ++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-	// $this->tabs = array('entity:-tabname); to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_admin');
-
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_admin', 'remove');
-
-	return $head;
-}
-
 /**
  *	Prepare array with list of tabs
  *
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index d50e9f572ad..a1571f7ac08 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -142,7 +142,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		print $langs->trans("Status");
 		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		$formactions->form_select_status_action('formaction',$status,1,'status',1,2);
+		$formactions->form_select_status_action('formaction', $status, 1, 'status', 1, 2, 'minwidth100');
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ad7e05b9a9f..f7b0bdd5ad9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5258,7 +5258,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 	    	}
     	}
 
-    	$substitutionarray['__ONLINE_PAYMENT_XXX__'] = 'todo';
+    	$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'LinkToPayOnlineIfApplicable';
     }
     if (empty($exclude) || ! in_array('objectamount', $exclude))
     {
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 7caac7a9452..aaaa0934890 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -117,11 +117,11 @@ function showOnlinePaymentUrl($type,$ref)
  * @param   int		$mode		0=True url, 1=Url formated with colors
  * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
  * @param	string	$ref		Ref of object
- * @param	int		$amount		Amount
+ * @param	int		$amount		Amount (required for $type='free' only)
  * @param	string	$freetag	Free tag
  * @return	string				Url string
  */
-function getOnlinePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
+function getOnlinePaymentUrl($mode, $type, $ref='', $amount='9.99', $freetag='your_free_tag')
 {
 	global $conf;
 
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index b01637d7b08..36372254b61 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -309,7 +309,7 @@ function show_stats_for_company($product,$socid)
 	print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
 	print '</tr>';
 
-	// Propals
+	// Customer proposals
 	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
 		$nblines++;
@@ -327,7 +327,25 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Commandes clients
+	// Supplier proposals
+	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+	{
+		$nblines++;
+		$ret=$product->load_stats_proposal_supplier($socid);
+		if ($ret < 0) dol_print_error($db);
+		$langs->load("propal");
+		print '<tr><td>';
+		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
+		print '</td><td align="right">';
+		print $product->stats_proposal_supplier['suppliers'];
+		print '</td><td align="right">';
+		print $product->stats_proposal_supplier['nb'];
+		print '</td><td align="right">';
+		print $product->stats_proposal_supplier['qty'];
+		print '</td>';
+		print '</tr>';
+	}
+	// Customer orders
 	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		$nblines++;
@@ -345,7 +363,7 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Commandes fournisseurs
+	// Supplier orders
 	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
 	{
 		$nblines++;
@@ -363,25 +381,7 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Contrats
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("contracts");
-		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_contrat['customers'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['nb'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Factures clients
+	// Customer invoices
 	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		$nblines++;
@@ -399,7 +399,7 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Factures fournisseurs
+	// Supplier invoices
 	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
 	{
 		$nblines++;
@@ -418,6 +418,25 @@ function show_stats_for_company($product,$socid)
 		print '</tr>';
 	}
 
+	// Contracts
+	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+	{
+		$nblines++;
+		$ret=$product->load_stats_contrat($socid);
+		if ($ret < 0) dol_print_error($db);
+		$langs->load("contracts");
+		print '<tr><td>';
+		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
+		print '</td><td align="right">';
+		print $product->stats_contrat['customers'];
+		print '</td><td align="right">';
+		print $product->stats_contrat['nb'];
+		print '</td><td align="right">';
+		print $product->stats_contrat['qty'];
+		print '</td>';
+		print '</tr>';
+	}
+
 	return $nblines++;
 }
 
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 47ec0741127..917cfd74891 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -217,18 +217,21 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	-- Setup
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2453__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_general',       2451__+MAX_llx_menu__, '/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'General', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 41, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 52, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 51, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 80, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 90, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 52, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 53, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 54, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 55, __ENTITY__);
+
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export',       2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
 	-- Accounting period
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
 	-- Binding
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 76eb879cd7b..395c883cbe3 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -969,37 +969,30 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				// Chart of account
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 10);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 20);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 20);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 30);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 40);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				if (! empty($conf->banque->enabled))
 				{
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/compta/bank/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuBankAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 42);
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/compta/bank/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuBankAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);
 				}
 				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 52);
 				}
 				if (! empty($conf->tax->enabled))
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 53);
 				}
 				if (! empty($conf->expensereport->enabled))
 				{
-				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
+				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 54);
 				}
-				/* not required yet, already supported by default account
-				if (! empty($conf->loan->enabled))
-				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/loan.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuLoanAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_loan', 45);
-				}
-				if (! empty($conf->don->enabled))
-				{
-				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
-				}*/
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 60);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);
 
 				// Fiscal year
 				if ($conf->global->MAIN_FEATURES_LEVEL > 0)     // Not yet used. In a future will lock some periods.
@@ -1083,36 +1076,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					}
 					else dol_print_error($db);
 					$db->free($resql);
-
-					/*
-					$sql = "SELECT rowid, label, accountancy_journal";
-					$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-					$sql.= " WHERE entity = ".$conf->entity;
-					$sql.= " AND clos = 0";
-					$sql.= " ORDER BY label";
-
-					$resql = $db->query($sql);
-					if ($resql)
-					{
-						$numr = $db->num_rows($resql);
-						$i = 0;
-
-						if ($numr > 0)
-						while ($i < $numr)
-						{
-							$objp = $db->fetch_object($resql);
-							if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_account='.$objp->rowid,$langs->trans("Journal").' - '.dol_trunc($objp->label,10),2,$user->rights->accounting->comptarapport->lire);
-							$i++;
-						}
-					}
-					else dol_print_error($db);
-					$db->free($resql);
-
-					// Add other journal
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/sellsjournal.php?mainmenu=accountancy&amp;leftmenu=accountancy_journal",$langs->trans("SellsJournal"),2,$user->rights->accounting->comptarapport->lire);
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&amp;leftmenu=accountancy_journal",$langs->trans("PurchasesJournal"),2,$user->rights->accounting->comptarapport->lire);
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&amp;leftmenu=accountancy_journal",$langs->trans("ExpenseReportsJournal"),2,$user->rights->accounting->comptarapport->lire);
-					*/
 				}
 
 				// General Ledger
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 496d054d86c..3f8a7c092b8 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -35,12 +35,12 @@ class modAccounting extends DolibarrModules
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
+	 */
 	function __construct($db)
 	{
 		global $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 		$this->numero = 50400;
 
 		$this->family = "financial";
@@ -60,7 +60,7 @@ class modAccounting extends DolibarrModules
 		$this->dirs = array('/accounting/temp');
 
 		// Config pages
-		$this->config_page_url = array('index.php@accountancy');
+		$this->config_page_url = array();
 
 		// Dependencies
 		$this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
@@ -84,116 +84,57 @@ class modAccounting extends DolibarrModules
 				"1",
 				"With this constants on, bank account number is always required"
 		);
-		$this->const[1] = array(
-				"ACCOUNTING_EXPORT_SEPARATORCSV",
-				"string",
-				","
-		);
-		$this->const[2] = array(
+		$this->const[3] = array(
 				"ACCOUNTING_ACCOUNT_SUSPENSE",
 				"chaine",
 				"471"
 		);
-		$this->const[3] = array(
-				"ACCOUNTING_SELL_JOURNAL",
-				"chaine",
-				"VTE"
-		);
 		$this->const[4] = array(
-				"ACCOUNTING_PURCHASE_JOURNAL",
-				"chaine",
-				"ACH"
-		);
-		$this->const[5] = array(
-				"ACCOUNTING_SOCIAL_JOURNAL",
-				"chaine",
-				"SOC"
-		);
-		$this->const[6] = array(
-				"ACCOUNTING_MISCELLANEOUS_JOURNAL",
-				"chaine",
-				"OD"
-		);
-		$this->const[7] = array(
 				"ACCOUNTING_ACCOUNT_TRANSFER_CASH",
 				"chaine",
 				"58"
 		);
-		$this->const[8] = array(
+		$this->const[5] = array(
 				"CHARTOFACCOUNTS",
 				"chaine",
 				"2"
 		);
-		$this->const[9] = array(
+		$this->const[6] = array(
 				"ACCOUNTING_EXPORT_MODELCSV",
 				"chaine",
 				"1"
 		);
-		$this->const[10] = array(
+		$this->const[7] = array(
 				"ACCOUNTING_LENGTH_GACCOUNT",
 				"chaine",
 				""
 		);
-		$this->const[11] = array(
+		$this->const[8] = array(
 				"ACCOUNTING_LENGTH_AACCOUNT",
 				"chaine",
 				""
 		);
-		$this->const[13] = array(
+		$this->const[9] = array(
 				"ACCOUNTING_LIST_SORT_VENTILATION_TODO",
 				"yesno",
 				"1"
 		);
-		$this->const[14] = array(
+		$this->const[10] = array(
 				"ACCOUNTING_LIST_SORT_VENTILATION_DONE",
 				"yesno",
 				"1"
 		);
-		/*
-		$this->const[15] = array (
-				"ACCOUNTING_GROUPBYACCOUNT",
-				"yesno",
-				"1"
-		);
-		*/
-		$this->const[16] = array (
+		$this->const[11] = array (
 				"ACCOUNTING_EXPORT_DATE",
 				"chaine",
 				"%d%m%Y"
 		);
-		/*
-		$this->const[17] = array (
-				"ACCOUNTING_EXPORT_PIECE",
-				"yesno",
-				"1"
+		$this->const[12] = array(
+				"ACCOUNTING_EXPORT_SEPARATORCSV",
+				"string",
+				","
 		);
-		$this->const[18] = array (
-				"ACCOUNTING_EXPORT_GLOBAL_ACCOUNT",
-				"yesno",
-				"1"
-		);
-		$this->const[19] = array (
-				"ACCOUNTING_EXPORT_LABEL",
-				"yesno",
-				"1"
-		);
-		$this->const[20] = array (
-				"ACCOUNTING_EXPORT_AMOUNT",
-				"yesno",
-				"1"
-		);
-		$this->const[21] = array (
-				"ACCOUNTING_EXPORT_DEVISE",
-				"yesno",
-				"1"
-		);
-		*/
-		$this->const[22] = array(
-				"ACCOUNTING_EXPENSEREPORT_JOURNAL",
-				"chaine",
-				"ER"
-		);
-		$this->const[23] = array(
+		$this->const[13] = array(
 				"ACCOUNTING_EXPORT_FORMAT",
 				"chaine",
 				"csv"
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
new file mode 100644
index 00000000000..062e9777b40
--- /dev/null
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -0,0 +1,206 @@
+<?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/>.
+ * or see http://www.gnu.org/
+ */
+
+
+/*
+ * Code to ouput content when action is presend
+ *
+ * $trackid must be defined
+ * $modelmail
+ * $defaulttopic
+ * $diroutput
+ */
+
+if ($action == 'presend')
+{
+	$langs->load("mails");
+
+	$titreform='SendMail';
+
+	$object->fetch_projet();
+
+	$ref = dol_sanitizeFileName($object->ref);
+	include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+	//
+	if ($object->element == 'invoice_supplier')
+	{
+		$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
+	}
+
+	$file = $fileparams['fullname'];
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang = '';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+	{
+		$newlang = $_REQUEST['lang_id'];
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+	{
+		$newlang = $object->thirdparty->default_lang;
+	}
+
+	if (!empty($newlang))
+	{
+		$outputlangs = new Translate('', $conf);
+		$outputlangs->setDefaultLang($newlang);
+		$outputlangs->load('commercial');
+	}
+
+	$topicmail='';
+	if (empty($object->ref_client)) {
+		$topicmail = $outputlangs->trans($defaulttopic, '__REF__');
+	} else if (! empty($object->ref_client)) {
+		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
+	}
+
+	// Build document if it not exists
+	if (! $file || ! is_readable($file)) {
+		$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		if ($result <= 0) {
+			dol_print_error($db, $object->error, $object->errors);
+			exit();
+		}
+		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		$file = $fileparams['fullname'];
+	}
+
+	print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+	print '<div class="clearboth"></div>';
+	print '<br>';
+	print load_fiche_titre($langs->trans($titreform));
+
+	dol_fiche_head('');
+
+	// Cree l'objet formulaire mail
+	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+	$formmail = new FormMail($db);
+	$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+	$formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+	if ($formmail->fromtype === 'user')
+	{
+		$formmail->fromid = $user->id;
+	}
+	$formmail->trackid=$trackid;
+	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	{
+		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+	}
+	$formmail->withfrom = 1;
+
+	$liste = array();
+	if ($object->element == 'expensereport')
+	{
+		$fuser = new User($db);
+		$fuser->fetch($object->fk_user_author);
+		$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
+	}
+	elseif ($object->element == 'societe')
+	{
+		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
+			$liste[$key] = $value;
+		}
+	}
+	else
+	{
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
+			$liste[$key] = $value;
+		}
+	}
+
+	$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+	$formmail->withtocc = $liste;
+	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+	$formmail->withtopic = $topicmail;
+	$formmail->withfile = 2;
+	$formmail->withbody = 1;
+	$formmail->withdeliveryreceipt = 1;
+	$formmail->withcancel = 1;
+
+	// Make substitution in email content
+	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$substitutionarray['__PERSONALIZED__'] = '';
+	$substitutionarray['__CONTACTCIVNAME__'] = '';
+	// Add specific substitution for contracts
+	if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
+	{
+		$datenextexpiration = '';
+		foreach ($object->lines as $line)
+		{
+			if ($line->statut != 4)
+				continue;
+				if ($line->date_fin_prevue > $datenextexpiration)
+					$datenextexpiration = $line->date_fin_prevue;
+		}
+		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+	}
+
+	// Choose one contact for the __CONTACTCIVNAME__ TODO Really not reliable.
+	/*
+	$custcontact = '';
+	$contactarr = array();
+	$contactarr = $object->liste_contact(-1, 'external');
+	if (is_array($contactarr) && count($contactarr) > 0)
+	{
+	foreach ($contactarr as $contact)
+	{
+	if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+	$contactstatic = new Contact($db);
+	$contactstatic->fetch($contact ['id']);
+	$custcontact = $contactstatic->getFullName($langs, 1);
+	}
+	}
+
+	if (! empty($custcontact)) {
+	$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+	}
+	}*/
+
+	$parameters = array(
+		'mode' => 'formemail'
+	);
+	complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
+
+	// Tableau des substitutions
+	$formmail->substit = $substitutionarray;
+
+	// Tableau des parametres complementaires
+	$formmail->param['action'] = 'send';
+	$formmail->param['models'] = $modelmail;
+	$formmail->param['models_id']=GETPOST('modelmailselected','int');
+	$formmail->param['id'] = $object->id;
+	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+	// Init list of files
+	if (GETPOST("mode") == 'init') {
+		$formmail->clear_attached_files();
+		$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+	}
+
+	// Show form
+	print $formmail->get_form();
+
+	dol_fiche_end();
+}
+
diff --git a/htdocs/core/tpl/massactions_form.tpl.php b/htdocs/core/tpl/massactions_form.tpl.php
index 72eb62db9be..4f8c7d15aeb 100644
--- a/htdocs/core/tpl/massactions_form.tpl.php
+++ b/htdocs/core/tpl/massactions_form.tpl.php
@@ -42,6 +42,8 @@ if (! GETPOST('cancel', 'alpha'))
 			$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
 			if ($objecttmp->element == 'societe')
 				$thirdpartyid = $objecttmp->id;
+			if ($objecttmp->element == 'expensereport')
+				$thirdpartyid = $objecttmp->fk_user_author;
 			$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
 			$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 		}
@@ -58,17 +60,14 @@ dol_fiche_head(null, '', '');
 // Cree l'objet formulaire mail
 include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 $formmail = new FormMail($db);
-$formmail->withform = - 1;
+$formmail->withform = -1;
 $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
 if ($formmail->fromtype === 'user')
 {
 	$formmail->fromid = $user->id;
 }
-if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
-{
-	$formmail->trackid = $trackid;
-}
+$formmail->trackid = $trackid;
 if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
 {
 	include DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
@@ -80,10 +79,19 @@ if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selec
 {
 	$liste = array();
 	$thirdpartyid = array_shift($listofselectedthirdparties);
-	$soc = new Societe($db);
-	$soc->fetch($thirdpartyid);
-	foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
-		$liste[$key] = $value;
+	if ($objecttmp->element == 'expensereport')
+	{
+		$fuser = new User($db);
+		$fuser->fetch($thirdpartyid);
+		$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
+	}
+	else
+	{
+		$soc = new Societe($db);
+		$soc->fetch($thirdpartyid);
+		foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
+			$liste[$key] = $value;
+		}
 	}
 	$formmail->withtoreadonly = 0;
 } else {
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 0f9826ea0e0..ec1fa9465b5 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -349,7 +349,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("interventions");
 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            if (empty($object->actionmsg))
+            {
+            	$object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            }
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
@@ -419,6 +422,54 @@ class InterfaceActionsAuto extends DolibarrTriggers
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
 		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+			$object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+			$object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+			$object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+
+			$object->sendtoid=0;
+		}
 		elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             $langs->load("agenda");
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 6f3ab42d7fc..02498009cd9 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -765,6 +765,10 @@ if (! empty($id) && $action != 'edit')
 
 	print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
+	// Show links to link elements
+	$linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
+	$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 	print '</div></div></div>';
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
new file mode 100644
index 00000000000..fdf6ae71c2f
--- /dev/null
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -0,0 +1,74 @@
+<?php
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2014       Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2017       Charlene Benke <cf.benke@patas-monkey.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/>.
+ *
+ */
+?>
+
+<!-- BEGIN PHP TEMPLATE -->
+
+<?php
+
+global $user;
+global $noMoreLinkedObjectBlockAfter;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+$langs->load("donations");
+
+$total=0; $ilink=0;
+$var=true;
+foreach($linkedObjectBlock as $key => $objectlink)
+{
+    $ilink++;
+    
+    $trclass=($var?'pair':'impair');
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+?>
+    <tr class="<?php echo $trclass; ?>">
+        <td><?php echo $langs->trans("Donation"); ?></td>
+        <td><?php echo $objectlink->getNomUrl(1); ?></td>
+    	<td align="center"><?php echo $objectlink->ref_client; ?></td>
+    	<td align="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
+    	<td align="right"><?php
+    			$total = $total + $objectlink->total_ht;
+    			echo price($objectlink->total_ht);
+		} ?>
+		</td>
+    	<td align="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+    </tr>
+<?php
+
+if (count($linkedObjectBlock) > 1)
+{
+    ?>
+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
+        <td><?php echo $langs->trans("Total"); ?></td>
+        <td></td>
+    	<td align="center"></td>
+    	<td align="center"></td>
+    	<td align="right"><?php echo price($total); ?></td>
+    	<td align="right"></td>
+    	<td align="right"></td>
+    </tr>
+    <?php  
+}
+?>
+
+<!-- END PHP TEMPLATE -->
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 640521bcc28..561f1ecd082 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -125,9 +125,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
-    {
-        $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+
     	$fk_projet='';
     	$date_start='';
     	$date_end='';
@@ -137,7 +143,7 @@ if (empty($reshook))
     	$value_unit='';
     	$qty=1;
     	$fk_c_type_fees=-1;
-    }
+	}
 
     include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; 	// Must be include, not include_once
 
@@ -1260,6 +1266,15 @@ if (empty($reshook))
     	}
     }
 
+	// Actions when printing a doc from card
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+    // Actions to send emails
+    $trigger_name='EXPENSEREPORT_SENTBYMAIL';
+    $autocopy='MAIN_MAIL_AUTOCOPY_EXPENSEREPORT_TO';
+    $trackid='exp'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
     // Actions to build doc
     $upload_dir = $conf->expensereport->dir_output;
     $permissioncreate = $user->rights->expensereport->creer;
@@ -2201,6 +2216,14 @@ if ($action != 'create' && $action != 'edit')
 	$object = new ExpenseReport($db);
 	$object->fetch($id, $ref);
 
+	// Send
+	if ($object->fk_statut > ExpenseReport::STATUS_DRAFT) {
+		//if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expensereport->expensereport_advance->send)) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
+		//} else
+		//	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
+	}
+
 
 	/* Si l'état est "Brouillon"
 	 *	ET user à droit "creer/supprimer"
@@ -2354,48 +2377,65 @@ print '</div>';
 //$conf->global->DOL_URL_ROOT_DOCUMENT_PHP=dol_buildpath('/expensereport/documentwrapper.php',1);
 
 
-print '<div class="fichehalfleft">';
-
-/*
- * Generate documents
- */
-
-if($user->rights->expensereport->export && $action != 'create' && $action != 'edit')
-{
-	$filename	=	dol_sanitizeFileName($object->ref);
-	$filedir	=	$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$urlsource	=	$_SERVER["PHP_SELF"]."?id=".$object->id;
-	$genallowed	=	1;
-	$delallowed	=	1;
-	$var 		= 	true;
-	print $formfile->showdocuments('expensereport',$filename,$filedir,$urlsource,$genallowed,$delallowed);
-	$somethingshown = $formfile->numoffiles;
+// Select mail models is same action as presend
+if (GETPOST('modelselected')) {
+	$action = 'presend';
 }
 
-print '</div>';
-
-if ($action != 'create' && $action != 'edit' && ($id || $ref))
+if ($action != 'presend')
 {
-    $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+	print '<div class="fichehalfleft">';
 
-    // Link invoice to intervention
-    if (GETPOST('LinkedFichinter')) {
-        $object->fetch($id);
-        $object->fetch_thirdparty();
-        $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
-    }
+	/*
+	 * Generate documents
+	 */
 
-    // Show links to link elements
-    $linktoelements=array();
-    if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION))
-    {
-        $linktoelements[]='fichinter';
-        $linktoelem = $form->showLinkToObjectBlock($object, $linktoelements, array('expensereport'));
-        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-    }
+	if($user->rights->expensereport->export && $action != 'create' && $action != 'edit')
+	{
+		$filename	=	dol_sanitizeFileName($object->ref);
+		$filedir	=	$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
+		$urlsource	=	$_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed	=	1;
+		$delallowed	=	1;
+		$var 		= 	true;
+		print $formfile->showdocuments('expensereport',$filename,$filedir,$urlsource,$genallowed,$delallowed);
+		$somethingshown = $formfile->numoffiles;
+	}
+
+	print '</div>';
+
+	if ($action != 'create' && $action != 'edit' && ($id || $ref))
+	{
+	    $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
+		include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+
+	    // Link invoice to intervention
+	    if (GETPOST('LinkedFichinter')) {
+	        $object->fetch($id);
+	        $object->fetch_thirdparty();
+	        $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
+	    }
+
+	    // Show links to link elements
+	    $linktoelements=array();
+	    if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION))
+	    {
+	        $linktoelements[]='fichinter';
+	        $linktoelem = $form->showLinkToObjectBlock($object, $linktoelements, array('expensereport'));
+	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	    }
+	}
 }
 
+// Presend form
+$modelmail='expensereport';
+$defaulttopic='SendExpenseReportRef';
+$diroutput = $conf->expensereport->dir_output;
+$trackid = 'exp'.$object->id;
+
+include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 01be3eb04cc..682ecf44839 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -36,14 +36,14 @@ $langs->load("companies");
 $langs->load("users");
 $langs->load("trips");
 
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
 $massaction=GETPOST('massaction','alpha');
 $show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
 $toselect = GETPOST('toselect', 'array');
 
 // Security check
-$socid = $_GET["socid"]?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'expensereport','','');
 
@@ -79,8 +79,8 @@ $optioncss = GETPOST('optioncss','alpha');
 if ($search_status == '') $search_status=-1;
 if ($search_user == '') $search_user=-1;
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$contextpage='expensereportlist';
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'expensereportlist';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expensereportlist'));
@@ -139,25 +139,31 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 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
-{
-    $search_ref="";
-    $search_user="";
-    $search_amount_ht="";
-    $search_amount_vat="";
-    $search_amount_ttc="";
-    $search_status="";
-    $month_start="";
-    $year_start="";
-    $month_end="";
-    $year_end="";
-    $toselect='';
-    $search_array_options=array();
-}
-
 if (empty($reshook))
 {
+	// 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
+	{
+	    $search_ref="";
+	    $search_user="";
+	    $search_amount_ht="";
+	    $search_amount_vat="";
+	    $search_amount_ttc="";
+	    $search_status="";
+	    $month_start="";
+	    $year_start="";
+	    $month_end="";
+	    $year_end="";
+	    $toselect='';
+	    $search_array_options=array();
+	}
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
+		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+	{
+		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
     $objectclass='ExpenseReport';
     $objectlabel='ExpenseReport';
     $permtoread = $user->rights->expensereport->lire;
@@ -167,7 +173,6 @@ if (empty($reshook))
 }
 
 
-
 /*
  * View
  */
@@ -176,7 +181,8 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
-llxHeader('', $langs->trans("ListOfTrips"));
+$title = $langs->trans("ListOfTrips");
+llxHeader('', $title);
 
 $max_year = 5;
 $min_year = 5;
@@ -184,7 +190,7 @@ $min_year = 5;
 
 $sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,";
 $sql.= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve, d.note_private, d.note_public,";
-$sql.= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.statut, u.photo";
+$sql.= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.email, u.statut, u.photo";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -267,6 +273,7 @@ $sql.=$hookmanager->resPrint;
 
 $sql.= $db->order($sortfield,$sortorder);
 
+// Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
@@ -276,14 +283,14 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql.= $db->plimit($limit+1, $offset);
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
-	$param="";
+	$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;
@@ -303,20 +310,22 @@ if ($resql)
 
 	// List of mass actions available
 	$arrayofmassactions =  array(
-	    //'presend'=>$langs->trans("SendByMail"),
+	    'presend'=>$langs->trans("SendByMail"),
 	    'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	if ($user->rights->expensereport->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+	// Lines of title fields
+	print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
     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="page" value="'.$page.'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 	$title = $langs->trans("ListTripsAndExpenses");
@@ -324,9 +333,9 @@ if ($resql)
 
 	if ($massaction == 'presend')
 	{
-		$topicmail="SendInterventionRef";
-		$modelmail="fichinter_send";
-		$objecttmp=new Intervention($db);
+		$topicmail="SendExpenseReport";
+		$modelmail="expensereport";
+		$objecttmp=new ExpenseReport($db);
 		$trackid='int'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
@@ -580,6 +589,7 @@ if ($resql)
     			$usertmp->login=$obj->login;
     			$usertmp->statut=$obj->statut;
     			$usertmp->photo=$obj->photo;
+    			$usertmp->email=$obj->email;
     			print $usertmp->getNomUrl(-1);
     			print '</td>';
     			if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index cc91a1e1441..32fcf3c9973 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -714,16 +714,19 @@ if (empty($reshook))
 		exit;
 	}
 
-	/*
-	 * Send mail
-	 */
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	$paramname='id';
-	$mode='emailfromintervention';
+	$trigger_name='FICHINTER_SENTBYMAIL';
+	$autocopy='MAIN_MAIL_AUTOCOPY_FICHINTER_TO';
 	$trackid='int'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
+	// Actions to build doc
+	$upload_dir = $conf->ficheinter->dir_output;
+	$permissioncreate = $user->rights->ficheinter->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'update_extras')
 	{
@@ -752,11 +755,6 @@ if (empty($reshook))
 		if ($error) $action = 'edit_extras';
 	}
 
-	// Actions to build doc
-	$upload_dir = $conf->ficheinter->dir_output;
-	$permissioncreate = $user->rights->ficheinter->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
 	{
 		if ($action == 'addcontact')
@@ -1714,124 +1712,18 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 
-	/*
-	 * Action presend
-	 */
+	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 		$action = 'presend';
 	}
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file=$fileparams['fullname'];
 
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
+	// Presend form
+	$modelmail='fichinter_send';
+	$defaulttopic='SendInterventionRef';
+	$diroutput = $conf->ficheinter->dir_output;
+	$trackid = 'int'.$object->id;
 
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('interventions');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			$result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file=$fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendInterventionByMail'));
-
-		dol_fiche_head('');
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='int'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'int'.$object->id);
-		}
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$outputlangs->trans('SendInterventionRef','__FICHINTERREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit['__FICHINTERREF__']=$object->ref;
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_fichinter_external_CUSTOMER')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='fichinter_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['fichinter_id']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index e92a7c25de3..05d935fbecf 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -134,7 +134,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not include_once
 
@@ -904,11 +912,21 @@ if (empty($reshook))
 	    }
 	}
 
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Actions to send emails
+	$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
+	$autocopy='MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO';
+	$trackid='sor'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
 	// Actions to build doc
 	$upload_dir = $conf->fournisseur->commande->dir_output;
 	$permissioncreate = $user->rights->fournisseur->commande->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
+
 	if ($action == 'update_extras')
 	{
 		// Fill array 'array_options' with data from add form
@@ -946,9 +964,6 @@ if (empty($reshook))
 		}
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
-
 	/*
 	 * Create an order
 	 */
@@ -1158,18 +1173,6 @@ if (empty($reshook))
 	    }
 	}
 
-	/*
-	 * Send mail
-	 */
-
-	// Actions to send emails
-	$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromsupplierorder';
-	$trackid='sor'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-
-
 	if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel','alpha'))
 	{
 	    $ws_url         = $object->thirdparty->webservices_url;
@@ -2143,343 +2146,6 @@ elseif (! empty($object->id))
 
 	dol_fiche_end();
 
-
-	/*
-	 * Action presend
-	 */
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file=$fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			$result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file=$fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendOrderByMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='sor'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sor'.$object->id);
-		}
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-		$formmail->withtopic=$outputlangs->trans('SendOrderRef','__REF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-
-		$object->fetch_projet();
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit['__ORDERREF__']=$object->ref;                  	// For backward compatibility
-		$formmail->substit['__ORDERSUPPLIERREF__']=$object->ref_supplier;	// For backward compatibility
-		$formmail->substit['__SUPPLIERORDERREF__']=$object->ref_supplier;
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='order_supplier_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['orderid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
-	/*
-	 * Action webservice
-	 */
-	elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel','alpha'))
-	{
-		$mode        = GETPOST('mode', 'alpha');
-		$ws_url      = $object->thirdparty->webservices_url;
-		$ws_key      = $object->thirdparty->webservices_key;
-		$ws_user     = GETPOST('ws_user','alpha');
-		$ws_password = GETPOST('ws_password','alpha');
-
-        // NS and Authentication parameters
-        $ws_ns = 'http://www.dolibarr.org/ns/';
-        $ws_authentication = array(
-            'dolibarrkey'=>$ws_key,
-            'sourceapplication'=>'DolibarrWebServiceClient',
-            'login'=>$ws_user,
-            'password'=>$ws_password,
-            'entity'=>''
-        );
-
-        print load_fiche_titre($langs->trans('CreateRemoteOrder'),'');
-
-        //Is everything filled?
-        if (empty($ws_url) || empty($ws_key)) {
-            setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors');
-            $mode = "init";
-            $error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled
-        } else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) {
-            setEventMessages($langs->trans("ErrorFieldsRequired"), null, 'errors');
-            $mode = "init";
-        }
-
-        if ($mode == "init")
-        {
-            //Table/form header
-            print '<table class="border" width="100%">';
-            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="webservice">';
-            print '<input type="hidden" name="mode" value="check">';
-
-            if ($error_occurred)
-            {
-                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-            }
-            else
-            {
-                $textinput_size = "50";
-                // Webservice url
-                print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
-                //Remote User
-                print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
-                //Remote Password
-                print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
-                //Submit button
-                print '<tr><td align="center" colspan="2">';
-                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
-                print ' &nbsp; &nbsp; ';
-                //Cancel button
-                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-                print '</td></tr>';
-            }
-
-            //End table/form
-            print '</form>';
-            print '</table>';
-        }
-        elseif ($mode == "check")
-        {
-            $ws_entity = '';
-            $ws_thirdparty = '';
-            $error_occurred = false;
-
-            //Create SOAP client and connect it to user
-            $soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php");
-            $soapclient_user->soap_defencoding='UTF-8';
-            $soapclient_user->decodeUTF8(false);
-
-            //Get the thirdparty associated to user
-            $ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
-            $result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
-            $user_status_code = $result_user["result"]["result_code"];
-
-            if ($user_status_code == "OK")
-            {
-                //Fill the variables
-                $ws_entity = $result_user["user"]["entity"];
-                $ws_authentication['entity'] = $ws_entity;
-                $ws_thirdparty = $result_user["user"]["fk_thirdparty"];
-                if (empty($ws_thirdparty))
-                {
-                    setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
-                    $error_occurred = true;
-                }
-                else
-                {
-                    //Create SOAP client and connect it to product/service
-                    $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
-                    $soapclient_product->soap_defencoding='UTF-8';
-                    $soapclient_product->decodeUTF8(false);
-
-                    // Iterate each line and get the reference that uses the supplier of that product/service
-                    $i = 0;
-                    foreach ($object->lines as $line) {
-                        $i = $i + 1;
-                        $ref_supplier = $line->ref_supplier;
-                        $line_id = $i."º) ".$line->product_ref.": ";
-                        if (empty($ref_supplier)) {
-                            continue;
-                        }
-                        $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
-                        $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
-                        if (!$result_product)
-                        {
-                            setEventMessages($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors');
-                            $error_occurred = true;
-                            break;
-                        }
-
-                        // Check the result code
-                        $status_code = $result_product["result"]["result_code"];
-                        if (empty($status_code)) //No result, check error str
-                        {
-                            setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-                        }
-                        else if ($status_code != "OK") //Something went wrong
-                        {
-                            if ($status_code == "NOT_FOUND")
-                            {
-                                setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
-                            }
-                            else
-                            {
-                                setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
-                                $error_occurred = true;
-                                break;
-                            }
-                        }
-
-
-                        // Ensure that price is equal and warn user if it's not
-                        $supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
-                        $local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
-
-                        $product_fourn = new ProductFournisseur($db);
-                        $product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
-                        if (count($product_fourn_list)>0)
-                        {
-                            foreach($product_fourn_list as $product_fourn_line)
-                            {
-                                //Only accept the line where the supplier is the same at this order and has the same ref
-                                if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
-                                    $local_price = price($product_fourn_line->fourn_price);
-                                }
-                            }
-                        }
-
-                        if ($local_price != NULL && $local_price != $supplier_price) {
-                            setEventMessages($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, null, 'warnings');
-                        }
-
-                        // Check if is in sale
-                        if (empty($result_product["product"]["status_tosell"])) {
-                            setEventMessages($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", null, 'warnings');
-                        }
-                    }
-                }
-
-            }
-            elseif ($user_status_code == "PERMISSION_DENIED")
-            {
-                setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
-                $error_occurred = true;
-            }
-            elseif ($user_status_code == "BAD_CREDENTIALS")
-            {
-                setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
-                $error_occurred = true;
-            }
-            else
-            {
-                setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
-                $error_occurred = true;
-            }
-
-            //Form
-            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="webservice">';
-            print '<input type="hidden" name="mode" value="send">';
-            print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
-            print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
-            print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
-            print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
-            if ($error_occurred)
-            {
-                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-            }
-            else
-            {
-                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
-                print ' &nbsp; &nbsp; ';
-            }
-            print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-            print '</form>';
-        }
-	}
-	/*
-	 * Show buttons
-	 */
-	else
-	{
 		/**
 		 * Boutons actions
 		 */
@@ -2700,7 +2366,7 @@ elseif (! empty($object->id))
 			}
 
 			print "</div>";
-		}
+
 
 
 		if ($user->rights->fournisseur->commande->commander && $object->statut == 2 && $action == 'makeorder')
@@ -2756,51 +2422,271 @@ elseif (! empty($object->id))
     		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
     		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
-		{
-			// Set status to received (action=livraison)
-			print '<!-- form to record supplier order received -->'."\n";
-			print '<form action="card.php?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden"	name="action" value="livraison">';
-			print load_fiche_titre($langs->trans("Receive"),'','');
 
-			print '<table class="noborder" width="100%">';
-			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
-			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-			print $form->select_date('','',1,1,'',"commande",1,1,1);
-			print "</td></tr>\n";
+			if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
+			{
+				// Set status to received (action=livraison)
+				print '<!-- form to record supplier order received -->'."\n";
+				print '<form action="card.php?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden"	name="action" value="livraison">';
+				print load_fiche_titre($langs->trans("Receive"),'','');
 
-			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
-			$liv = array();
-			$liv[''] = '&nbsp;';
-			$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
-			$liv['par']	= $langs->trans("PartialWoman");
-			$liv['nev']	= $langs->trans("NeverReceived");
-			$liv['can']	= $langs->trans("Canceled");
+				print '<table class="noborder" width="100%">';
+				//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
+				print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
+				print $form->select_date('','',1,1,'',"commande",1,1,1);
+				print "</td></tr>\n";
 
-			print $form->selectarray("type",$liv);
+				print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
+				$liv = array();
+				$liv[''] = '&nbsp;';
+				$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
+				$liv['par']	= $langs->trans("PartialWoman");
+				$liv['nev']	= $langs->trans("NeverReceived");
+				$liv['can']	= $langs->trans("Canceled");
 
-			print '</td></tr>';
-			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
-			print "</table>\n";
-			print "</form>\n";
-			print "<br>";
+				print $form->selectarray("type",$liv);
+
+				print '</td></tr>';
+				print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
+				print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+				print "</table>\n";
+				print "</form>\n";
+				print "<br>";
+			}
+
+	        // List of actions on element
+	        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	        $formactions=new FormActions($db);
+	        $somethingshown = $formactions->showactions($object,'order_supplier',$socid,1,'listaction'.($genallowed?'largetitle':''));
+
+			print '</div></div></div>';
 		}
 
-        // List of actions on element
-        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-        $formactions=new FormActions($db);
-        $somethingshown = $formactions->showactions($object,'order_supplier',$socid,1,'listaction'.($genallowed?'largetitle':''));
+		/*
+		 * Action webservice
+		 */
+		if ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel','alpha'))
+		{
+			$mode        = GETPOST('mode', 'alpha');
+			$ws_url      = $object->thirdparty->webservices_url;
+			$ws_key      = $object->thirdparty->webservices_key;
+			$ws_user     = GETPOST('ws_user','alpha');
+			$ws_password = GETPOST('ws_password','alpha');
+
+			// NS and Authentication parameters
+			$ws_ns = 'http://www.dolibarr.org/ns/';
+			$ws_authentication = array(
+			'dolibarrkey'=>$ws_key,
+			'sourceapplication'=>'DolibarrWebServiceClient',
+			'login'=>$ws_user,
+			'password'=>$ws_password,
+			'entity'=>''
+			);
+
+			print load_fiche_titre($langs->trans('CreateRemoteOrder'),'');
+
+			//Is everything filled?
+			if (empty($ws_url) || empty($ws_key)) {
+				setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors');
+				$mode = "init";
+				$error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled
+			} else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) {
+				setEventMessages($langs->trans("ErrorFieldsRequired"), null, 'errors');
+				$mode = "init";
+			}
+
+			if ($mode == "init")
+			{
+				//Table/form header
+				print '<table class="border" width="100%">';
+				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="webservice">';
+				print '<input type="hidden" name="mode" value="check">';
+
+				if ($error_occurred)
+				{
+					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
+					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				}
+				else
+				{
+					$textinput_size = "50";
+					// Webservice url
+					print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
+					//Remote User
+					print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
+					//Remote Password
+					print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
+					//Submit button
+					print '<tr><td align="center" colspan="2">';
+					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
+					print ' &nbsp; &nbsp; ';
+					//Cancel button
+					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+					print '</td></tr>';
+				}
+
+				//End table/form
+				print '</form>';
+				print '</table>';
+			}
+			elseif ($mode == "check")
+			{
+				$ws_entity = '';
+				$ws_thirdparty = '';
+				$error_occurred = false;
+
+				//Create SOAP client and connect it to user
+				$soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php");
+				$soapclient_user->soap_defencoding='UTF-8';
+				$soapclient_user->decodeUTF8(false);
+
+				//Get the thirdparty associated to user
+				$ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
+				$result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
+				$user_status_code = $result_user["result"]["result_code"];
+
+				if ($user_status_code == "OK")
+				{
+					//Fill the variables
+					$ws_entity = $result_user["user"]["entity"];
+					$ws_authentication['entity'] = $ws_entity;
+					$ws_thirdparty = $result_user["user"]["fk_thirdparty"];
+					if (empty($ws_thirdparty))
+					{
+						setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
+						$error_occurred = true;
+					}
+					else
+					{
+						//Create SOAP client and connect it to product/service
+						$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
+						$soapclient_product->soap_defencoding='UTF-8';
+						$soapclient_product->decodeUTF8(false);
+
+						// Iterate each line and get the reference that uses the supplier of that product/service
+						$i = 0;
+						foreach ($object->lines as $line) {
+							$i = $i + 1;
+							$ref_supplier = $line->ref_supplier;
+							$line_id = $i."º) ".$line->product_ref.": ";
+							if (empty($ref_supplier)) {
+								continue;
+							}
+							$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
+							$result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
+							if (!$result_product)
+							{
+								setEventMessages($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors');
+								$error_occurred = true;
+								break;
+							}
+
+							// Check the result code
+							$status_code = $result_product["result"]["result_code"];
+							if (empty($status_code)) //No result, check error str
+							{
+								setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
+							}
+							else if ($status_code != "OK") //Something went wrong
+							{
+								if ($status_code == "NOT_FOUND")
+								{
+									setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
+								}
+								else
+								{
+									setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
+									$error_occurred = true;
+									break;
+								}
+							}
 
 
+							// Ensure that price is equal and warn user if it's not
+							$supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
+							$local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
 
+							$product_fourn = new ProductFournisseur($db);
+							$product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
+							if (count($product_fourn_list)>0)
+							{
+								foreach($product_fourn_list as $product_fourn_line)
+								{
+									//Only accept the line where the supplier is the same at this order and has the same ref
+									if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
+										$local_price = price($product_fourn_line->fourn_price);
+									}
+								}
+							}
 
-		print '</div></div></div>';}
+							if ($local_price != NULL && $local_price != $supplier_price) {
+								setEventMessages($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, null, 'warnings');
+							}
+
+							// Check if is in sale
+							if (empty($result_product["product"]["status_tosell"])) {
+								setEventMessages($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", null, 'warnings');
+							}
+						}
+					}
+
+				}
+				elseif ($user_status_code == "PERMISSION_DENIED")
+				{
+					setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
+					$error_occurred = true;
+				}
+				elseif ($user_status_code == "BAD_CREDENTIALS")
+				{
+					setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
+					$error_occurred = true;
+				}
+				else
+				{
+					setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
+					$error_occurred = true;
+				}
+
+				//Form
+				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="webservice">';
+				print '<input type="hidden" name="mode" value="send">';
+				print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
+				print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
+				print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
+				print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
+				if ($error_occurred)
+				{
+					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
+				}
+				else
+				{
+					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
+					print ' &nbsp; &nbsp; ';
+				}
+				print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '</form>';
+			}
+		}
+
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		// Presend form
+		$modelmail='supplier_order_send';
+		$defaulttopic='SendOrderRef';
+		$diroutput = $conf->fournisseur->commande->dir_output;
+		$trackid = 'sor'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
-
-	print '</td></tr></table>';
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 927347eb37e..0801b64243d 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -114,7 +114,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not include_once
 
@@ -1211,14 +1219,13 @@ if (empty($reshook))
 	    }
 	}
 
-	/*
-	 * Send mail
-	 */
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
 	$trigger_name='BILL_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
-	$mode='emailfromsupplierinvoice';
+	$autocopy='MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO';
 	$trackid='sin'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
@@ -2823,124 +2830,18 @@ else
 			}
         }
 
-        /*
-         * Show mail form
-         */
+        // Select mail models is same action as presend
         if (GETPOST('modelselected')) {
         	$action = 'presend';
         }
-        if ($action == 'presend')
-        {
-            $ref = dol_sanitizeFileName($object->ref);
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref, preg_quote($ref,'/').'([^\-])+');
-            $file=$fileparams['fullname'];
 
-            // Define output language
-            $outputlangs = $langs;
-            $newlang = '';
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-            	$newlang = $_REQUEST['lang_id'];
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-            	$newlang = $object->thirdparty->default_lang;
+        // Presend form
+        $modelmail='supplier_order_send';
+        $defaulttopic='SendBillRef';
+        $diroutput = $conf->fournisseur->facture->dir_output;
+        $trackid = 'sin'.$object->id;
 
-            if (!empty($newlang))
-            {
-                $outputlangs = new Translate('', $conf);
-                $outputlangs->setDefaultLang($newlang);
-                $outputlangs->load('bills');
-            }
-
-            // Build document if it not exists
-            if (! $file || ! is_readable($file))
-            {
-	            $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                if ($result < 0)
-                {
-                    dol_print_error($db,$object->error,$object->errors);
-                    exit;
-                }
-                $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref, preg_quote($ref,'/').'([^\-])+');
-                $file=$fileparams['fullname'];
-            }
-
-			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-            print '<div class="clearboth"></div>';
-            print '<br>';
-            print load_fiche_titre($langs->trans('SendBillByMail'));
-
-            dol_fiche_head('');
-
-            // Cree l'objet formulaire mail
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            $formmail = new FormMail($db);
-            $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-            $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-            if($formmail->fromtype === 'user'){
-                $formmail->fromid = $user->id;
-
-            }
-           	$formmail->trackid='sin'.$object->id;
-            if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-            {
-            	include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            	$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sin'.$object->id);
-            }
-            $formmail->withfrom=1;
-			$liste=array();
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-			$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-			$formmail->withtocc=$liste;
-            $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-            $formmail->withtopic=$outputlangs->trans('SendBillRef','__REF__');
-            $formmail->withfile=2;
-            $formmail->withbody=1;
-            $formmail->withdeliveryreceipt=1;
-            $formmail->withcancel=1;
-			// Tableau des substitutions
-			$formmail->setSubstitFromObject($object);
-            $formmail->substit['__SUPPLIERINVREF__']=$object->ref;
-
-            //Find the good contact adress
-            $custcontact='';
-            $contactarr=array();
-            $contactarr=$object->liste_contact(-1,'external');
-
-            if (is_array($contactarr) && count($contactarr)>0) {
-            	foreach($contactarr as $contact) {
-            		if ($contact['libelle']==$langs->trans('TypeContact_invoice_supplier_external_BILLING')) {
-            			require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-            			$contactstatic=new Contact($db);
-            			$contactstatic->fetch($contact['id']);
-            			$custcontact=$contactstatic->getFullName($langs,1);
-            		}
-            	}
-
-            	if (!empty($custcontact)) {
-            		$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-            	}
-            }
-
-            // Tableau des parametres complementaires
-            $formmail->param['action']='send';
-            $formmail->param['models']='invoice_supplier_send';
-            $formmail->param['models_id']=GETPOST('modelmailselected','int');
-            $formmail->param['facid']=$object->id;
-            $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-            // Init list of files
-            if (GETPOST("mode")=='init')
-            {
-                $formmail->clear_attached_files();
-                $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-            }
-
-            // Show form
-            print $formmail->get_form();
-
-            dol_fiche_end();
-        }
+        include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
     }
 }
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 8fae09c1adf..c11b914c45d 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -119,8 +119,8 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.datef,f.rowid";
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$contextpage='supplierinvoicelist';
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'supplierinvoicelist';
 
 $diroutputmassaction=$conf->fournisseur->facture->dir_output . '/temp/massgeneration/'.$user->id;
 
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 94202f6570f..51811f25a86 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -50,8 +50,12 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CREATE','Supplier order created','Executed when a supplier order is created','order_supplier',11);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10);
+--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CREATE','Supplier order created','Executed when a supplier order is created','order_supplier',11);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',12);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',13);
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index 5af427242f4..3394a1db3e9 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -41,6 +41,9 @@ ALTER TABLE llx_website_page ADD COLUMN fk_user_modif integer;
 
 -- For 7.0
 
+ALTER TABLE llx_c_paiement        ADD COLUMN position        integer NOT NULL DEFAULT 0;
+ALTER TABLE llx_c_payment_term    ADD COLUMN position        integer NOT NULL DEFAULT 0;
+
 ALTER TABLE llx_product MODIFY COLUMN seuil_stock_alerte integer DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN seuil_stock_alerte SET DEFAULT NULL;
 
@@ -261,8 +264,16 @@ UPDATE llx_accounting_account SET pcg_type = 'EXPENSE' where pcg_type = 'CHARGE'
 UPDATE llx_accounting_account SET pcg_type = 'INCOME'  where pcg_type = 'VENTAS_E_INGRESOS';
 UPDATE llx_accounting_account SET pcg_type = 'EXPENSE' where pcg_type = 'COMPRAS_GASTOS';
 
+ALTER TABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(24) NOT NULL;
+
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18);
 
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10);
+
+
 CREATE TABLE llx_projet_task_comment (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
@@ -274,6 +285,19 @@ CREATE TABLE llx_projet_task_comment (
     import_key varchar(125) DEFAULT NULL
 )ENGINE=innodb;
 
+-- Accountancy - Remove old constants
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_SELL_JOURNAL')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_PURCHASE_JOURNAL')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_SOCIAL_JOURNAL')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_MISCELLANEOUS_JOURNAL')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_GROUPBYACCOUNT')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_EXPORT_GLOBAL_ACCOUNT')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_EXPORT_LABEL')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_EXPORT_AMOUNT')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_EXPORT_DEVISE')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_EXPORT_PIECE')__;
+DELETE FROM llx_const WHERE name = __ENCRYPT('ACCOUNTING_EXPENSEREPORT_JOURNAL')__;
+
 -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
 -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
 -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_bookkeeping MODIFY numero_compte VARCHAR(20) CHARACTER SET utf8;
diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
index cbec0c81437..4f7dbccc786 100644
--- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
@@ -22,7 +22,7 @@
 create table llx_c_action_trigger
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
-  elementtype	varchar(16) 			NOT NULL,
+  elementtype	varchar(24) 			NOT NULL,
   code			varchar(32)				NOT NULL,
   label			varchar(128)			NOT NULL,
   description	varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
index 1759af781f8..7db85510608 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.sql
@@ -26,7 +26,8 @@ create table llx_c_paiement
   type       		smallint,	-- 0: input money, 1: output money, 2: input and output, 3: other
   active     		tinyint DEFAULT 1  NOT NULL,
   accountancy_code	varchar(32) NULL,
-  module     		varchar(32) NULL
+  module     		varchar(32) NULL,
+  position      	integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
 
 
diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql
index a2d79af2502..d0f07abc5a1 100644
--- a/htdocs/install/mysql/tables/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql
@@ -28,5 +28,6 @@ create table llx_c_payment_term
   type_cdr        tinyint,    			-- Type of change date reckoning. 1=Payment at end of current month, 2=the Nth of next month
   nbjour          smallint,
   decalage		  smallint,
-  module          varchar(32) NULL
+  module          varchar(32) NULL,
+  position        integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9e1efae59bb..8ab0ddc018c 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -66,7 +66,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accountancy code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
 MenuAccountancy=Accountancy
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
@@ -170,7 +170,7 @@ DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to accountancy account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -256,14 +256,14 @@ ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
 WithoutValidAccount=Without valid dedicated account
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a0acab0470c..9ba32d3fddc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -441,9 +441,9 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible. 
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.  
+ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.  
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.  
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account). 
@@ -1170,7 +1170,7 @@ HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
 CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
+AccountCodeManager=Module for accounting code generation (customer or supplier)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
 NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
@@ -1539,7 +1539,7 @@ Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
+AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code 
 ##### Agenda #####
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index f88fc541b13..88c6bbc54f5 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -85,6 +85,9 @@ EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
 EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
 EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
 EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 54ebb4bf1ee..9febf20505f 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -106,8 +106,8 @@ SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
-CustomerAccountancyCode=Customer accountancy code
-SupplierAccountancyCode=Supplier accountancy code
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Supplier accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -210,7 +210,7 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
+AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 4ab81a4ceb6..d6e0c404d25 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -69,8 +69,8 @@ ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubc
 EMailSentToNRecipients=EMail sent to %s recipients.
 EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
-AllRecipientSelected=The %s thirdparties selected, and if an email is set.
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
+AllRecipientSelected=The %s unique recipients selected (1 email per recipient), and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d16da33e0a4..1b92d87e9ba 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -747,7 +747,7 @@ SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (ot
 OriginFileName=Original filename
 SetDemandReason=Set source
 SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+AccountCurrency=Account currency
 ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more lines
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index f33968e0ff9..6bc5d842a8e 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -20,8 +20,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (purchase)
-ProductAccountancySellCode=Accountancy code (sale)
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancySellCode=Accounting code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 645ff0d0773..1a9b5cde8d0 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -99,7 +99,7 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accountancy code
+UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateEmployment=Date of Employment
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 8aa6cc3ad9a..37354d854b0 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -114,13 +114,11 @@ if (empty($reshook))
 
 	if ($cancel)
 	{
-		if ($action != 'addlink')
+		if (! empty($backtopage))
 		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/myobject_list.php',1);
-			header("Location: ".$urltogo);
+			header("Location: ".$backtopage);
 			exit;
 		}
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
 		$action='';
 	}
 
@@ -215,6 +213,15 @@ if (empty($reshook))
 			else setEventMessages($object->error, null, 'errors');
 		}
 	}
+
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Actions to send emails
+	$trigger_name='MYOBJECT_SENTBYMAIL';
+	$autocopy='MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
+	$trackid='myobject'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -510,127 +517,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    print '</div></div></div>';
 	}
 
+	// Presend form
+	$modelmail='myobject';
+	$defaulttopic='Information';
+	$diroutput = $conf->mymodule->dir_output;
+	$trackid = 'myobject'.$object->id;
 
-	/*
-	 * Action presend
-	 */
-    /*
-	if ($action == 'presend')
-	{
-		$object->fetch_projet();
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendMyObjectByMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='ord'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendMyObjectRef', '__REF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendMyObjectRef', '__REF__ (__REFCLIENT__)');
-		}
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit ['__REF__'] = $object->ref;
-
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0)
-		{
-			foreach ($contactarr as $contact)
-			{
-				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'myobject_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['myobjectid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}*/
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 54afc80691f..143b375f5b3 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -340,7 +340,7 @@ if (empty($reshook))
             if ($id > 0)
             {
 				// Category association
-				$categories = GETPOST('categories');
+				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
 
                 header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
@@ -444,7 +444,7 @@ if (empty($reshook))
                     if ($object->update($object->id, $user) > 0)
                     {
 						// Category association
-						$categories = GETPOST('categories');
+						$categories = GETPOST('categories', 'array');
 						$object->setCategories($categories);
 
                         $action = 'view';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d3347557332..bdb9f3349af 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2133,6 +2133,49 @@ class Product extends CommonObject
 	}
 
 
+	/**
+	 *  Charge tableau des stats propale pour le produit/service
+	 *
+	 *  @param    int	$socid      Id thirdparty
+	 *  @return   array       		Tableau des stats
+	 */
+	function load_stats_proposal_supplier($socid=0)
+	{
+		global $conf;
+		global $user;
+
+		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";
+		$sql.= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
+		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";
+		$sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE p.rowid = pd.fk_supplier_proposal";
+		$sql.= " AND p.fk_soc = s.rowid";
+		$sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		$sql.= " AND pd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		//$sql.= " AND pr.fk_statut != 0";
+		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
+
+		$result = $this->db->query($sql);
+		if ( $result )
+		{
+			$obj=$this->db->fetch_object($result);
+			$this->stats_proposal_supplier['suppliers']=$obj->nb_suppliers;
+			$this->stats_proposal_supplier['nb']=$obj->nb;
+			$this->stats_proposal_supplier['rows']=$obj->nb_rows;
+			$this->stats_proposal_supplier['qty']=$obj->qty?$obj->qty:0;
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+
 	/**
 	 *  Charge tableau des stats commande client pour le produit/service
 	 *
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 5a371554058..4eb8992d837 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -228,7 +228,7 @@ if ($id > 0 || ! empty($ref))
 	                    print '<td>'.$societestatic->getNomUrl(1).'</td>';
 	                    print "<td>".$objp->code_client."</td>\n";
 						print '<td align="center">';
-						print dol_print_date($db->jdate($objp->date_commande))."</td>";
+						print dol_print_date($db->jdate($objp->date_commande), 'dayhour')."</td>";
 						print  '<td align="center">'.$objp->qty."</td>\n";
 	                    print '<td align="right">'.price($objp->total_ht)."</td>\n";
 						print '<td align="right">'.$orderstatic->LibStatut($objp->statut,$objp->facture,5).'</td>';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index daf2a9c3654..4b9aa67236e 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -236,7 +236,7 @@ if ($id > 0 || ! empty($ref)) {
 						print '<td>' . $societestatic->getNomUrl(1) . '</td>';
 						print "<td>" . $objp->code_client . "</td>\n";
 						print '<td align="center">';
-						print dol_print_date($db->jdate($objp->date_commande)) . "</td>";
+						print dol_print_date($db->jdate($objp->date_commande), 'dayhour') . "</td>";
 						print '<td align="center">' . $objp->qty . "</td>\n";
 						print '<td align="right">' . price($objp->total_ht) . "</td>\n";
 						print '<td align="right">' . $supplierorderstatic->getLibStatut(4) . '</td>';
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index f9eed565903..8780a8a6a3b 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -190,7 +190,7 @@ if ($id > 0 || ! empty($ref))
 					print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
 					print "<td>".$objp->code_client."</td>\n";
 					print "<td align=\"center\">";
-					print dol_print_date($db->jdate($objp->date_contrat))."</td>";
+					print dol_print_date($db->jdate($objp->date_contrat), 'dayhour')."</td>";
 					//print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
 					//print '<td align="right">';
 					print '<td align="center">'.($objp->nb_initial>0?$objp->nb_initial:'').'</td>';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 8cdc0efd5c0..36359d1bd35 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -251,7 +251,7 @@ if ($id > 0 || ! empty($ref))
                         print '<td>'.$societestatic->getNomUrl(1).'</td>';
                         print "<td>".$objp->code_client."</td>\n";
                         print '<td align="center">';
-                        print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+                        print dol_print_date($db->jdate($objp->datef),'dayhour')."</td>";
                         print '<td align="center">'.$objp->qty."</td>\n";
                         print '<td align="right">'.price($objp->total_ht)."</td>\n";
                         print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5,$paiement,$objp->type).'</td>';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 586741496c2..6618d8deac8 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -229,7 +229,7 @@ if ($id > 0 || ! empty($ref))
 						print '<td>' . $societestatic->getNomUrl(1) . '</td>';
 						print "<td>" . $objp->code_client . "</td>\n";
                    		print '<td align="center">';
-						print dol_print_date($db->jdate($objp->datef)) . "</td>";
+						print dol_print_date($db->jdate($objp->datef), 'dayhour') . "</td>";
 						print '<td align="center">' . $objp->qty . "</td>\n";
 						print '<td align="right">' . price($objp->total_ht) . "</td>\n";
 						print '<td align="right">' . $supplierinvoicestatic->LibStatut($objp->paye, $objp->statut, 5) . '</td>';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index a5801c422e0..3f6eae0bfce 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -230,7 +230,7 @@ if ($id > 0 || ! empty($ref))
 						$societestatic->fetch($objp->socid);
                         print '<td>'.$societestatic->getNomUrl(1).'</td>';
 						print '<td align="center">';
-						print dol_print_date($db->jdate($objp->datep)) . "</td>";
+						print dol_print_date($db->jdate($objp->datep), 'dayhour') . "</td>";
 						print "<td align=\"center\">" . $objp->qty . "</td>\n";
 						print '<td align="right">' . price($objp->amount) . '</td>' . "\n";
 						print '<td align="right">' . $propalstatic->LibStatut($objp->statut, 5) . '</td>';
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
new file mode 100644
index 00000000000..1e0cefc3150
--- /dev/null
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -0,0 +1,266 @@
+<?php
+/* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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/product/stats/supplier_proposal.php
+ * \ingroup product service propal
+ * \brief 	Page des stats des propals pour un produit
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+
+$langs->load("products");
+$langs->load("companies");
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+// Security check
+$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
+$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
+$socid='';
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array ('productstatspropal'));
+
+$mesg = '';
+
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if ($page == - 1) {	$page = 0;}
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder = "DESC";
+if (! $sortfield) $sortfield = "p.date_valid";
+
+$search_month = GETPOST('search_month', 'aplha');
+$search_year = GETPOST('search_year', 'int');
+
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha')) {
+	$search_month = '';
+	$search_year = '';
+}
+
+/*
+ * View
+ */
+
+$propalstatic = new SupplierProposal($db);
+$societestatic=new Societe($db);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+
+if ($id > 0 || ! empty($ref))
+{
+	$product = new Product($db);
+	$result = $product->fetch($id, $ref);
+
+    $object = $product;
+
+	$parameters = array ('id' => $id);
+	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
+
+	if ($result > 0)
+	{
+		$head = product_prepare_head($product);
+		$titre = $langs->trans("CardProduct" . $product->type);
+		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
+        print '<div class="fichecenter">';
+
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
+
+		show_stats_for_company($product, $socid);
+
+		print "</table>";
+
+        print '</div>';
+        print '<div style="clear:both"></div>';
+
+		dol_fiche_end();
+
+
+		if ($user->rights->propale->lire)
+		{
+			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
+			//$sql .= " p.ref_supplier,";
+			$sql .= "p.date_valid, p.fk_statut as statut, d.rowid, d.qty";
+			if (! $user->rights->societe->client->voir && ! $socid)
+				$sql .= ", sc.fk_soc, sc.fk_user ";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+			$sql .= "," . MAIN_DB_PREFIX . "supplier_proposal as p";
+			$sql .= ", " . MAIN_DB_PREFIX . "supplier_proposaldet as d";
+			if (! $user->rights->societe->client->voir && ! $socid)
+				$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+			$sql .= " WHERE p.fk_soc = s.rowid";
+			$sql .= " AND p.entity IN (".getEntity('propal').")";
+			$sql .= " AND d.fk_supplier_proposal = p.rowid";
+			$sql .= " AND d.fk_product =" . $product->id;
+			if (! empty($search_month))
+				$sql .= ' AND MONTH(p.datep) IN (' . $search_month . ')';
+			if (! empty($search_year))
+				$sql .= ' AND YEAR(p.datep) IN (' . $search_year . ')';
+			if (! $user->rights->societe->client->voir && ! $socid)
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+			if ($socid)
+				$sql .= " AND p.fk_soc = " . $socid;
+			$sql .= " ORDER BY $sortfield $sortorder ";
+
+			// Calcul total qty and amount for global if full scan list
+			$total_ht = 0;
+			$total_qty = 0;
+			$totalrecords = 0;
+			if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+				$result = $db->query($sql);
+				if ($result) {
+					$totalrecords = $db->num_rows($result);
+					while ( $objp = $db->fetch_object($result) ) {
+						$total_ht += $objp->amount;
+						$total_qty += $objp->qty;
+					}
+				}
+			}
+
+			$sql .= $db->plimit($conf->liste_limit + 1, $offset);
+
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+
+				if (! empty($id))
+					$option .= '&amp;id=' . $product->id;
+				if (! empty($search_month))
+					$option .= '&amp;search_month=' . $search_month;
+				if (! empty($search_year))
+					$option .= '&amp;search_year=' . $search_year;
+
+				print '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $product->id . '" name="search_form">' . "\n";
+				if (! empty($sortfield))
+					print '<input type="hidden" name="sortfield" value="' . $sortfield . '"/>';
+				if (! empty($sortorder))
+					print '<input type="hidden" name="sortorder" value="' . $sortorder . '"/>';
+				if (! empty($page)) {
+					print '<input type="hidden" name="page" value="' . $page . '"/>';
+					$option .= '&amp;page=' . $page;
+				}
+
+				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], "&amp;id=$product->id", $sortfield, $sortorder, '', $num, $totalrecords, '');
+                print '<div class="liste_titre liste_titre_bydiv centpercent">';
+                print '<div class="divsearchfield">';
+				print $langs->trans('Period') . ' (' . $langs->trans("DatePropal") . ') - ';
+				print $langs->trans('Month') . ':<input class="flat" type="text" size="4" name="search_month" value="' . $search_month . '"> ';
+				print $langs->trans('Year') . ':' . $formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print '<div style="vertical-align: middle; display: inline-block">';
+				print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+				print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
+				print '</div>';
+				print '</div>';
+				print '</div>';
+
+				$i = 0;
+                print '<div class="div-table-responsive">';
+				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("DatePropal", $_SERVER["PHP_SELF"], "p.date_valid", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], "p.total", "", $option, 'align="right"', $sortfield, $sortorder);
+				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "p.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
+				print "</tr>\n";
+
+				if ($num > 0)
+				{
+					$var = True;
+					while ($i < $num && $i < $conf->liste_limit)
+					{
+						$objp = $db->fetch_object($result);
+						$var = ! $var;
+
+						print '<tr ' . $bc[$var] . '>';
+						print '<td>';
+						$propalstatic->id=$objp->propalid;
+						$propalstatic->ref=$objp->ref;
+						print $propalstatic->getNomUrl(1);
+						 print "</td>\n";
+						$societestatic->fetch($objp->socid);
+                        print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print '<td align="center">';
+						print dol_print_date($db->jdate($objp->date_valid), 'dayhour') . "</td>";
+						print "<td align=\"center\">" . $objp->qty . "</td>\n";
+						print '<td align="right">' . price($objp->amount) . '</td>' . "\n";
+						print '<td align="right">' . $propalstatic->LibStatut($objp->statut, 5) . '</td>';
+						print "</tr>\n";
+						$i ++;
+
+						if (! empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+							$total_ht += $objp->total_ht;
+							$total_qty += $objp->qty;
+						}
+					}
+				}
+
+        		print '<tr class="liste_total">';
+        		print '<td>' . $langs->trans('Total') . '</td>';
+        		print '<td colspan="2"></td>';
+        		print '<td align="center">' . $total_qty . '</td>';
+        		print '<td align="right">' . price($total_ht) . '</td>';
+        		print '<td></td>';
+        		print "</table>";
+        		print '</div>';
+        		print '</form>';
+    		} else {
+    			dol_print_error($db);
+    		}
+    		$db->free($result);
+		}
+	}
+} else {
+	dol_print_error();
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 085af055f38..97f9ff41d54 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -187,7 +187,7 @@ if (empty($reshook))
 	        if (! $error && !empty($object->id) > 0)
 	        {
 	        	// Category association
-	        	$categories = GETPOST('categories');
+	        	$categories = GETPOST('categories', 'array');
 	        	$result=$object->setCategories($categories);
 	        	if ($result<0) {
 		        	$langs->load("errors");
@@ -282,7 +282,7 @@ if (empty($reshook))
 		        else setEventMessages($object->error, $object->errors, 'errors');
 	    	}else {
 	    		// Category association
-	    		$categories = GETPOST('categories');
+	    		$categories = GETPOST('categories', 'array');
 	    		$result=$object->setCategories($categories);
 	    		if ($result < 0)
 	    		{
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 3ee3cf2593b..a36337c324d 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -259,7 +259,7 @@ if ($id > 0 || ! empty($ref))
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
 		}
-		
+
 		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
@@ -286,14 +286,14 @@ if ($id > 0 || ! empty($ref))
 		}
 
 		dol_banner_tab($task, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-		
+
 		print '<div class="fichecenter">';
 
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
-		
+
 		// Nb comments
-		print '<td class="tdtop">'.$langs->trans("TaskNbComments").'</td><td>';
+		print '<td class="titlefield">'.$langs->trans("TaskNbComments").'</td><td>';
 		print $task->getNbComments();
 		print '</td></tr>';
 
@@ -307,46 +307,46 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 		dol_fiche_end();
-		
-		
+
+
 		print '<br>';
 		print '<div id="comment">';
-		
+
 		// Add comment
-		
+
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="addcomment">';
 		print '<input type="hidden" name="id" value="'.$task->id.'">';
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-		
+
 		print '<table class="noborder nohover" width="100%">';
-		
+
 		print '<tr class="liste_titre">';
 		print '<td width="25%">'.$langs->trans("Comments").'</td>';
 		print '<td width="25%"></td>';
 		print '<td width="25%"></td>';
 		print '<td width="25%"></td>';
 		print "</tr>\n";
-		
+
 		print '<tr class="oddeven">';
 		print '<td></td>';
-		
+
 		// Description
 		print '<td colspan="2">';
-		
+
 		$desc = ($_POST['comment_description']?$_POST['comment_description']:'');
-		
+
 		$doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '100%');
 		print $doleditor->Create(1);
-		
+
 		print '</td>';
-		
+
 		print '<td align="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 		print '</td></tr>';
 		print '</table></form>';
-		
+
 		// List of comments
 		if(!empty($task->comments)) {
 			// Default color for current user
@@ -367,7 +367,7 @@ if ($id > 0 || ! empty($ref))
 				if($comment->fk_user == $user->id) {
 					print '<div class="width25p float">&nbsp;</div>';
 				}
-				
+
 				print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
 				print '<div class="comment-info comment-cell">';
 				if (! empty($user->photo))
@@ -377,7 +377,7 @@ if ($id > 0 || ! empty($ref))
 				print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
 				print $langs->trans('Date').' : '.dol_print_date($comment->datec,'dayhoursec');
 				print '</div>'; // End comment-info
-				
+
 				print '<div class="comment-cell comment-right">';
 				print '<div class="comment-table width100p">';
 				print '<div class="comment-description comment-cell">';
@@ -391,17 +391,17 @@ if ($id > 0 || ! empty($ref))
 				print '</div>'; // End comment-table
 				print '</div>'; // End comment-right
 				print '</div>'; // End comment
-				
+
 				if($comment->fk_user != $user->id) {
 					print '<div class="width25p float">&nbsp;</div>';
 				}
 				print '<div class="clearboth"></div>';
 				print '</div>'; // end 100p
-				
+
 				$first = false;
 			}
 		}
-		
+
 		print '<br>';
 		print '</div>';
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index d4029847534..3d834fe28b6 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -187,7 +187,7 @@ if ($id > 0 || ! empty($ref))
     		// Tabs for project
     		$tab='tasks';
     		$head=project_prepare_head($projectstatic);
-    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
+    		dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
     		$param=($mode=='mine'?'&mode=mine':'');
 
@@ -272,8 +272,11 @@ if ($id > 0 || ! empty($ref))
             print '<div class="clearboth"></div>';
 
     		dol_fiche_end();
+
+    		print '<br>';
 		}
 
+
 		// To verify role of users
 		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
 		//$arrayofuseridoftask=$object->getListContactId('internal');
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 649e1efd575..f6f206f90ec 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -130,7 +130,8 @@ if ($object->id > 0)
 		// Tabs for project
 		$tab='tasks';
 		$head=project_prepare_head($projectstatic);
-		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
+
+		dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
 		$param=($mode=='mine'?'&mode=mine':'');
 
@@ -215,6 +216,8 @@ if ($object->id > 0)
         print '<div class="clearboth"></div>';
 
 		dol_fiche_end();
+
+		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 13a8979ae91..87d949eb645 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -110,7 +110,7 @@ if ($object->id > 0)
 		// Tabs for project
 		$tab='tasks';
 		$head=project_prepare_head($projectstatic);
-		dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($projectstatic->public?'projectpub':'project'));
+		dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
 		$param=($mode=='mine'?'&mode=mine':'');
 		// Project card
@@ -194,6 +194,8 @@ if ($object->id > 0)
 		print '<div class="clearboth"></div>';
 
 		dol_fiche_end();
+
+		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 1b43940029f..db56534f851 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -279,6 +279,7 @@ if ($id > 0 || ! empty($ref))
             print '</table>';
 
             print '</div>';
+
             print '<div class="fichehalfright">';
             print '<div class="ficheaddleft">';
             print '<div class="underbanner clearboth"></div>';
@@ -468,6 +469,7 @@ if ($id > 0 || ! empty($ref))
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 
 			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
 
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border" width="100%">';
@@ -490,8 +492,21 @@ if ($id > 0 || ! empty($ref))
 			}
 			print '</td></tr>';
 
+			// Description
+			print '<td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+			print nl2br($object->description);
+			print '</td></tr>';
+
+			print '</table>';
+			print '</div>';
+
+			print '<div class="fichehalfright"><div class="ficheaddleft">';
+
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border" width="100%">';
+
 			// Progress declared
-			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+			print '<tr><td class="titlefield">'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
 			if ($object->progress != '')
 			{
 				print $object->progress.' %';
@@ -506,12 +521,7 @@ if ($id > 0 || ! empty($ref))
 				if ($tmparray['total_duration'] > 0 && ! empty($object->planned_workload)) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 				else print '0 %';
 			}
-			else print '';
-			print '</td></tr>';
-
-			// Description
-			print '<td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
-			print nl2br($object->description);
+			else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 			print '</td></tr>';
 
 			// Other attributes
@@ -522,6 +532,10 @@ if ($id > 0 || ! empty($ref))
 			print '</table>';
 
 			print '</div>';
+			print '</div>';
+
+			print '</div>';
+			print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
 		}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8b85c299fdc..b3bbccfcb4e 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -418,6 +418,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
     			print '</div>';
 			}
+			else
+			{
+				print '<br>';
+			}
 		}
 	}
 
@@ -442,7 +446,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 
 		$morehtmlref='';
-		
+
 		// Project
 		if (empty($withproject))
 		{
@@ -450,7 +454,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		    $morehtmlref.=$langs->trans("Project").': ';
 		    $morehtmlref.=$projectstatic->getNomUrl(1);
 		    $morehtmlref.='<br>';
-			
+
 		    // Third party
 	    	$morehtmlref.=$langs->trans("ThirdParty").': ';
 	    	if (is_object($projectstatic->thirdparty)) {
@@ -464,7 +468,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 
-        	print '<div class="underbanner clearboth"></div>';
+        print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
 
 		// Date start - Date end
@@ -491,7 +495,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print '<table class="border" width="100%">';
 
 		// Progress declared
-		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
+		print '<tr><td class="titlefield">'.$langs->trans("ProgressDeclared").'</td><td>';
 		print $object->progress.' %';
 		print '</td></tr>';
 
@@ -503,7 +507,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %';
 			else print '0 %';
 		}
-		else print '';
+		else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 		print '</td></tr>';
 
 		print '</table>';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 7b4bae14a14..80d6799e278 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -490,7 +490,7 @@ if (empty($reshook))
                     }
 
 					// Customer categories association
-					$custcats = GETPOST( 'custcats', 'array' );
+					$custcats = GETPOST('custcats', 'array');
 					$object->setCategories($custcats, 'customer');
 
 					// Supplier categories association
@@ -607,7 +607,7 @@ if (empty($reshook))
                 }
 
 				// Customer categories association
-				$categories = GETPOST( 'custcats', 'array' );
+				$categories = GETPOST('custcats', 'array');
 				$object->setCategories($categories, 'customer');
 
 				// Supplier categories association
@@ -2485,7 +2485,6 @@ else
 			$formmail->withdeliveryreceipt=1;
 			$formmail->withcancel=1;
 			// Array of substitutions
-			$formmail->withsubstit='AvailableVariables';
 			$formmail->setSubstitFromObject($object);
 			$formmail->substit['__THIRDPARTY_ID__']=$object->id;		// substit in setSubstitFromObject was wrong for this one
 			$formmail->substit['__THIRDPARTY_NAME__']=$object->name;	// substit in setSubstitFromObject was wrong for this one
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index fda4eea65ea..1b3857fdbf1 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -115,7 +115,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; 	// Must be include, not include_once
 
@@ -462,16 +470,19 @@ if (empty($reshook))
 		}
 	}
 
-	// Action for direct print
+	// Actions when printing a doc from card
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	$trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromsupplierproposal';
+	$trigger_name='PROPOSAL_SUPPLIER_SENTBYMAIL';
+	$autocopy='MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO';
 	$trackid='spr'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
+	// Actions to build doc
+	$upload_dir = $conf->supplier_proposal->dir_output;
+	$permissioncreate = $user->rights->supplier_proposal->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
 	// Go back to draft
@@ -876,44 +887,6 @@ if (empty($reshook))
 		exit();
 	}
 
-	// Generation doc (depuis lien ou depuis cartouche doc)
-	else if ($action == 'builddoc' && $user->rights->supplier_proposal->creer) {
-		if (GETPOST('model')) {
-			$object->setDocModel($user, GETPOST('model'));
-		}
-
-		// Define output language
-		$outputlangs = $langs;
-		if (! empty($conf->global->MAIN_MULTILANGS)) {
-			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$ret = $object->fetch($id); // Reload to get new records
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		if ($result <= 0)
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-		}
-	}
-
-	// Remove file in doc form
-	else if ($action == 'remove_file' && $user->rights->supplier_proposal->creer) {
-		if ($object->id > 0) {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-			$langs->load("other");
-			$upload_dir = $conf->supplier_proposal->dir_output;
-			$file = $upload_dir . '/' . GETPOST('file');
-			$ret = dol_delete_file($file, 0, 0, 0, $object);
-			if ($ret)
-				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else
-				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
-		}
-	}
-
 	// Set project
 	else if ($action == 'classin' && $user->rights->supplier_proposal->creer) {
 		$object->setProject($_POST['projectid']);
@@ -1811,108 +1784,18 @@ if ($action == 'create')
 		print '</div></div></div>';
 	}
 
-	/*
-	 * Action presend
- 	 */
+	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 		$action = 'presend';
 	}
-	if ($action == 'presend')
-	{
-		$object->fetch_projet();
 
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->supplier_proposal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
+	// Presend form
+	$modelmail='supplier_proposal_send';
+	$defaulttopic='SendAskRef';
+	$diroutput = $conf->supplier_proposal->dir_output;
+	$trackid = 'spr'.$object->id;
 
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-			$outputlangs->load('supplier_proposal');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->supplier_proposal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendAskByMail'));
-
-		dol_fiche_head('');
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='spr'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'spr'.$object->id);
-		}
-
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST("sendto") ? GETPOST("sendto") : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = (! empty($conf->global->MAIN_EMAIL_USECCC) ? $conf->global->MAIN_EMAIL_USECCC : false);
-
-		$formmail->withtopic = $outputlangs->trans('SendAskRef', '__SUPPLIERPROPREF__');
-
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit['__SUPPLIERPROPREF__'] = $object->ref;
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'supplier_proposal_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['id'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a495290f47a..273c71d8e8c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -260,7 +260,7 @@ if (empty($reshook)) {
 				}
             			if (! empty($conf->categorie->enabled)) {
 					// Categories association
-					$usercats = GETPOST( 'usercats', 'array' );
+					$usercats = GETPOST('usercats', 'array');
 					$object->setCategories($usercats);
 				}
 				$db->commit();
@@ -478,7 +478,7 @@ if (empty($reshook)) {
             	if (! $error && ! count($object->errors))
             	{
             		// Then we add the associated categories
-            		$categories = GETPOST( 'usercats', 'array' );
+            		$categories = GETPOST('usercats', 'array');
             		$object->setCategories($categories);
             	}