diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 9017ece676e..9c9be3e1b9b 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2015-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2018       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2019       Ferran Marcet           <fmarcet@2byte.es>
+/* Copyright (C) 2015-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018	   Nicolas ZABOURI	<info@inovea-conseil.com>
+ * Copyright (C) 2018 	   Juanjo Menent  <jmenent@2byte.es>
+ * Copyright (C) 2019 	   Ferran Marcet  <fmarcet@2byte.es>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,8 +39,8 @@
 // Protection
 if (empty($objectclass) || empty($uploaddir))
 {
-    dol_print_error(null, 'include of actions_massactions.inc.php is done but var $massaction or $objectclass or $uploaddir was not defined');
-    exit;
+	dol_print_error(null, 'include of actions_massactions.inc.php is done but var $massaction or $objectclass or $uploaddir was not defined');
+	exit;
 }
 
 
@@ -48,227 +48,228 @@ if (empty($objectclass) || empty($uploaddir))
 $maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if (! empty($massaction) && is_array($toselect) && count($toselect) < 1)
 {
-    $error++;
-    setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
+	$error++;
+	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
 }
 if (! $error && is_array($toselect) && count($toselect) > $maxformassaction)
 {
-    setEventMessages($langs->trans('TooManyRecordForMassAction', $maxformassaction), null, 'errors');
-    $error++;
+	setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
+	$error++;
 }
 
 if (! $error && $massaction == 'confirm_presend' && ! GETPOST('sendmail'))  // If we do not choose button send (for example when we change template or limit), we must not send email, but keep on send email form
 {
-    $massaction='presend';
+	$massaction='presend';
 }
 if (! $error && $massaction == 'confirm_presend')
 {
-    $resaction = '';
-    $nbsent = 0;
-    $nbignored = 0;
-    $langs->load("mails");
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	$resaction = '';
+	$nbsent = 0;
+	$nbignored = 0;
+	$langs->load("mails");
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    $listofobjectid=array();
-    $listofobjectthirdparties=array();
-    $listofobjectref=array();
+	$listofobjectid=array();
+	$listofobjectthirdparties=array();
+	$listofobjectref=array();
+	$attachedfilesThirdpartyObj=array();
+	$oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
 
-    if (! $error)
-    {
-        $thirdparty=new Societe($db);
+	if (! $error)
+	{
+		$thirdparty=new Societe($db);
 
-        $objecttmp=new $objectclass($db);
-        if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
-        if ($objecttmp->element == 'holiday')       $thirdparty=new User($db);
+		$objecttmp=new $objectclass($db);
+		if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
+		if ($objecttmp->element == 'holiday')       $thirdparty=new User($db);
 
-        foreach($toselect as $toselectid)
-        {
-            $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;
+		foreach($toselect as $toselectid)
+		{
+			$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;
-                if ($objecttmp->element == 'holiday')       $thirdpartyid=$objecttmp->fk_user;
-                if (empty($thirdpartyid)) $thirdpartyid=0;
+				$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;
+				if ($objecttmp->element == 'holiday')       $thirdpartyid=$objecttmp->fk_user;
+				if (empty($thirdpartyid)) $thirdpartyid=0;
 
-                $listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
-                $listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
-            }
-        }
-    }
+				$listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
+				$listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
+			}
+		}
+	}
 
-    // Check mandatory parameters
-    if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email))
-    {
-        $error++;
-        setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
-        $massaction='presend';
-    }
+	// Check mandatory parameters
+	if (GETPOST('fromtype','alpha') === 'user' && empty($user->email))
+	{
+		$error++;
+		setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
+		$massaction='presend';
+	}
 
-    $receiver=$_POST['receiver'];
-    if (! is_array($receiver))
-    {
-        if (empty($receiver) || $receiver == '-1') $receiver=array();
-        else $receiver=array($receiver);
-    }
-    if (! trim($_POST['sendto']) && 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';
-    }
+	$receiver=$_POST['receiver'];
+	if (! is_array($receiver))
+	{
+		if (empty($receiver) || $receiver == '-1') $receiver=array();
+		else $receiver=array($receiver);
+	}
+	if (! trim($_POST['sendto']) && 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';
-    }
+	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);
-            if ($result < 0)
-            {
-                dol_print_error($db);
-                exit;
-            }
+	// Loop on each recipient/thirdparty
+	if (! $error)
+	{
+		foreach ($listofobjectthirdparties as $thirdpartyid)
+		{
+			$result = $thirdparty->fetch($thirdpartyid);
+			if ($result < 0)
+			{
+				dol_print_error($db);
+				exit;
+			}
 
-            $sendto='';
-            $sendtocc='';
-            $sendtobcc='';
-            $sendtoid = array();
+			$sendto='';
+			$sendtocc='';
+			$sendtobcc='';
+			$sendtoid = array();
 
-            // Define $sendto
-            $tmparray=array();
-            if (trim($_POST['sendto']))
-            {
-                // Recipients are provided into free text
-                $tmparray[] = trim($_POST['sendto']);
-            }
-            if (count($receiver)>0)
-            {
-                foreach($receiver as $key=>$val)
-                {
-                    // Recipient was provided from combo list
-                    if ($val == 'thirdparty') // Id of third party or user
-                    {
-                        $tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-                    }
-                    elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
-                    {
-                        $tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
-                        $sendtoid[] = $val;
-                    }
-                }
-            }
-            $sendto=implode(',', $tmparray);
+			// Define $sendto
+			$tmparray=array();
+			if (trim($_POST['sendto']))
+			{
+				// Recipients are provided into free text
+				$tmparray[] = trim($_POST['sendto']);
+			}
+			if (count($receiver)>0)
+			{
+				foreach($receiver as $key=>$val)
+				{
+					// Recipient was provided from combo list
+					if ($val == 'thirdparty') // Id of third party or user
+					{
+						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
+					}
+					elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
+					{
+						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+						$sendtoid[] = $val;
+					}
+				}
+			}
+			$sendto=implode(',',$tmparray);
 
-            // Define $sendtocc
-            $receivercc=$_POST['receivercc'];
-            if (! is_array($receivercc))
-            {
-                if ($receivercc == '-1') $receivercc=array();
-                else $receivercc=array($receivercc);
-            }
-            $tmparray=array();
-            if (trim($_POST['sendtocc']))
-            {
-                $tmparray[] = trim($_POST['sendtocc']);
-            }
-            if (count($receivercc) > 0)
-            {
-                foreach($receivercc as $key=>$val)
-                {
-                    // Recipient was provided from combo list
-                    if ($val == 'thirdparty') // Id of third party
-                    {
-                        $tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-                    }
-                    elseif ($val)	// Id du contact
-                    {
-                        $tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
-                        //$sendtoid[] = $val;  TODO Add also id of contact in CC ?
-                    }
-                }
-            }
-            $sendtocc=implode(',', $tmparray);
+			// Define $sendtocc
+			$receivercc=$_POST['receivercc'];
+			if (! is_array($receivercc))
+			{
+				if ($receivercc == '-1') $receivercc=array();
+				else $receivercc=array($receivercc);
+			}
+			$tmparray=array();
+			if (trim($_POST['sendtocc']))
+			{
+				$tmparray[] = trim($_POST['sendtocc']);
+			}
+			if (count($receivercc) > 0)
+			{
+				foreach($receivercc as $key=>$val)
+				{
+					// Recipient was provided from combo list
+					if ($val == 'thirdparty') // Id of third party
+					{
+						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
+					}
+					elseif ($val)	// Id du contact
+					{
+						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
+					}
+				}
+			}
+			$sendtocc=implode(',',$tmparray);
 
-            //var_dump($listofobjectref);exit;
-            $attachedfiles=array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
-            $listofqualifiedobj=array();
-            $listofqualifiedref=array();
-            $thirdpartywithoutemail=array();
+			//var_dump($listofobjectref);exit;
+			$listofqualifiedobj=array();
+			$listofqualifiedref=array();
+			$thirdpartywithoutemail=array();
 
-            foreach($listofobjectref[$thirdpartyid] as $objectid => $objectobj)
-            {
-                //var_dump($thirdpartyid.' - '.$objectid.' - '.$objectobj->statut);
-                if ($objectclass == 'Propal' && $objectobj->statut == Propal::STATUS_DRAFT)
-                {
-                    $langs->load("errors");
-                    $nbignored++;
-                    $resaction.='<div class="error">'.$langs->trans('ErrorOnlyProposalNotDraftCanBeSentInMassAction', $objectobj->ref).'</div><br>';
-                    continue; // Payment done or started or canceled
-                }
-                if ($objectclass == 'Commande' && $objectojb->statut == Commande::STATUS_DRAFT)
-                {
-                    $langs->load("errors");
-                    $nbignored++;
-                    $resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction', $objectobj->ref).'</div><br>';
-                    continue;
-                }
-                if ($objectclass == 'Facture' && $objectobj->statut == Facture::STATUS_DRAFT)
-                {
-                    $langs->load("errors");
-                    $nbignored++;
-                    $resaction.='<div class="error">'.$langs->trans('ErrorOnlyInvoiceValidatedCanBeSentInMassAction', $objectobj->ref).'</div><br>';
-                    continue; // Payment done or started or canceled
-                }
+			foreach($listofobjectref[$thirdpartyid] as $objectid => $objectobj)
+			{
+				//var_dump($thirdpartyid.' - '.$objectid.' - '.$objectobj->statut);
+				if ($objectclass == 'Propal' && $objectobj->statut == Propal::STATUS_DRAFT)
+				{
+					$langs->load("errors");
+					$nbignored++;
+					$resaction.='<div class="error">'.$langs->trans('ErrorOnlyProposalNotDraftCanBeSentInMassAction',$objectobj->ref).'</div><br>';
+					continue; // Payment done or started or canceled
+				}
+				if ($objectclass == 'Commande' && $objectobj->statut == Commande::STATUS_DRAFT)
+				{
+					$langs->load("errors");
+					$nbignored++;
+					$resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction',$objectobj->ref).'</div><br>';
+					continue;
+				}
+				if ($objectclass == 'Facture' && $objectobj->statut == Facture::STATUS_DRAFT)
+				{
+					$langs->load("errors");
+					$nbignored++;
+					$resaction.='<div class="error">'.$langs->trans('ErrorOnlyInvoiceValidatedCanBeSentInMassAction',$objectobj->ref).'</div><br>';
+					continue; // Payment done or started or canceled
+				}
 
-                // Test recipient
-                if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
-                {
-                    if ($objectobj->element == 'expensereport')
-                    {
-                        $fuser = new User($db);
-                        $fuser->fetch($objectobj->fk_user_author);
-                        $sendto = $fuser->email;
-                    }
-                    elseif ($objectobj->element == 'holiday')
-                    {
-                        $fuser = new User($db);
-                        $fuser->fetch($objectobj->fk_user);
-                        $sendto = $fuser->email;
-                    }
-                    else
-                    {
-                        $objectobj->fetch_thirdparty();
-                        $sendto = $objectobj->thirdparty->email;
-                    }
-                }
+				// Test recipient
+				if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
+				{
+					if ($objectobj->element == 'expensereport')
+					{
+						$fuser = new User($db);
+						$fuser->fetch($objectobj->fk_user_author);
+						$sendto = $fuser->email;
+					}
+					elseif ($objectobj->element == 'holiday')
+					{
+					    $fuser = new User($db);
+					    $fuser->fetch($objectobj->fk_user);
+					    $sendto = $fuser->email;
+					}
+					else
+					{
+						$objectobj->fetch_thirdparty();
+						$sendto = $objectobj->thirdparty->email;
+					}
+				}
 
-                if (empty($sendto))
-                {
-                    //print "No recipient for thirdparty ".$objectobj->thirdparty->name;
-                    $nbignored++;
-                    if (empty($thirdpartywithoutemail[$objectobj->thirdparty->id]))
-                    {
-                        $resaction.='<div class="error">'.$langs->trans('NoRecipientEmail', $objectobj->thirdparty->name).'</div><br>';
-                    }
-                    dol_syslog('No recipient for thirdparty: '.$objectobj->thirdparty->name, LOG_WARNING);
-                    $thirdpartywithoutemail[$objectobj->thirdparty->id]=1;
-                    continue;
-                }
+				if (empty($sendto))
+				{
+				   	//print "No recipient for thirdparty ".$objectobj->thirdparty->name;
+				   	$nbignored++;
+				   	if (empty($thirdpartywithoutemail[$objectobj->thirdparty->id]))
+					{
+						$resaction.='<div class="error">'.$langs->trans('NoRecipientEmail',$objectobj->thirdparty->name).'</div><br>';
+					}
+					dol_syslog('No recipient for thirdparty: '.$objectobj->thirdparty->name, LOG_WARNING);
+					$thirdpartywithoutemail[$objectobj->thirdparty->id]=1;
+				   	continue;
+				}
 
-                if ($_POST['addmaindocfile'])
-                {
+				if ($_POST['addmaindocfile'])
+				{
 					// TODO Use future field $objectobj->fullpathdoc to know where is stored default file
 					// TODO If not defined, use $objectobj->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
 					$filename = dol_sanitizeFileName($objectobj->ref).'.pdf';
@@ -281,841 +282,864 @@ if (! $error && $massaction == 'confirm_presend')
 					// For supplier invoices, we use the file provided by supplier, not the one we generate
 					if ($objectobj->element == 'invoice_supplier')
 					{
-						$fileparams = dol_most_recent_file($uploaddir.'/'.get_exdir($objectobj->id, 2, 0, 0, $objectobj, $objectobj->element).$objectobj->ref, preg_quote($objectobj->ref, '/').'([^\-])+');
+						$fileparams = dol_most_recent_file($uploaddir . '/' . get_exdir($objectobj->id,2,0,0,$objectobj,$objectobj->element).$objectobj->ref, preg_quote($objectobj->ref,'/').'([^\-])+');
 						$file = $fileparams['fullname'];
 					}
 
-                    $mime = dol_mimetype($file);
+					$mime = dol_mimetype($file);
 
-                    if (dol_is_file($file))
-                    {
-                        // Create form object
-                        $attachedfiles=array(
-                            'paths'=>array_merge($attachedfiles['paths'], array($file)),
-                            'names'=>array_merge($attachedfiles['names'], array($filename)),
-                            'mimes'=>array_merge($attachedfiles['mimes'], array($mime))
-                        );
-                    }
-                    else
-                    {
-                        $nbignored++;
-                        $langs->load("errors");
-                        $resaction.='<div class="error">'.$langs->trans('ErrorCantReadFile', $file).'</div><br>';
-                        dol_syslog('Failed to read file: '.$file, LOG_WARNING);
-                        continue;
-                    }
-                }
+	   				if (dol_is_file($file))
+					{
+						// Create form object
+						$attachedfilesThirdpartyObj[$thirdpartyid][$objectid]=array(
+							'paths'=>array($file),
+							'names'=>array($filename),
+							'mimes'=>array($mime)
+						);
+					}
+					else
+					{
+							$nbignored++;
+							$langs->load("errors");
+							$resaction.='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div><br>';
+							dol_syslog('Failed to read file: '.$file, LOG_WARNING);
+							continue;
+					}
+				}
 
-                // Object of thirdparty qualified, we add it
-                $listofqualifiedobj[$objectid]=$objectobj;
-                $listofqualifiedref[$objectid]=$objectobj->ref;
+				// Object of thirdparty qualified, we add it
+				$listofqualifiedobj[$objectid]=$objectobj;
+				$listofqualifiedref[$objectid]=$objectobj->ref;
 
-                //var_dump($listofqualifiedref);
-            }
 
-            // Send email if there is at least one qualified object for current thirdparty
-            if (count($listofqualifiedobj) > 0)
-            {
-                $langs->load("commercial");
+				//var_dump($listofqualifiedref);
+			}
 
-                $fromtype = GETPOST('fromtype');
-                if ($fromtype === 'user') {
-                    $from = $user->getFullName($langs) .' <'.$user->email.'>';
-                }
-                elseif ($fromtype === 'company') {
-                    $from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-                }
-                elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
-                    $tmp=explode(',', $user->email_aliases);
-                    $from = trim($tmp[($reg[1] - 1)]);
-                }
-                elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-                    $tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
-                    $from = trim($tmp[($reg[1] - 1)]);
-                }
-                elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
-                    $sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
-                    $resql = $db->query($sql);
-                    $obj = $db->fetch_object($resql);
-                    if ($obj)
-                    {
-                        $from = $obj->label.' <'.$obj->email.'>';
-                    }
-                }
-                else {
-                    $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
-                }
+			// Send email if there is at least one qualified object for current thirdparty
+			if (count($listofqualifiedobj) > 0)
+			{
+				$langs->load("commercial");
 
-                $replyto = $from;
-                $subject = GETPOST('subject', 'none');
-                $message = GETPOST('message', 'none');
+				$fromtype = GETPOST('fromtype');
+				if ($fromtype === 'user') {
+					$from = $user->getFullName($langs) .' <'.$user->email.'>';
+				}
+				elseif ($fromtype === 'company') {
+					$from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+				}
+				elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+					$tmp=explode(',', $user->email_aliases);
+					$from = trim($tmp[($reg[1] - 1)]);
+				}
+				elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+					$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+					$from = trim($tmp[($reg[1] - 1)]);
+				}
+				elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+					$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
+					$resql = $db->query($sql);
+					$obj = $db->fetch_object($resql);
+					if ($obj)
+					{
+						$from = $obj->label.' <'.$obj->email.'>';
+					}
+				}
+				else {
+					$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+				}
 
-                $sendtobcc = GETPOST('sendtoccc');
-                if ($objectclass == 'Propal') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
-                if ($objectclass == 'Commande') 			$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
-                if ($objectclass == 'Facture') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
-                if ($objectclass == 'Supplier_Proposal') 	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
-                if ($objectclass == 'CommandeFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
-                if ($objectclass == 'FactureFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
-                if ($objectclass == 'Project') 			    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO));
+				$replyto = $from;
+				$subject = GETPOST('subject','none');
+				$message = GETPOST('message','none');
 
-                // $listofqualifiedobj is array with key = object id and value is instance of qualified objects, for the current thirdparty (but thirdparty property is not loaded yet)
-                // $looparray will be an array with number of email to send for the current thirdparty (so 1 or n if n object for same thirdparty)
-                $oneemailperrecipient=(GETPOST('oneemailperrecipient', 'alpha')=='on'?1:0);
-                $looparray=array();
-                if (! $oneemailperrecipient)
-                {
-                    $looparray = $listofqualifiedobj;
-                    foreach ($looparray as $key => $objecttmp)
-                    {
-                        $looparray[$key]->thirdparty = $thirdparty;   // Force thirdparty on object
-                    }
-                }
-                else
-                {
-                    $objectforloop=new $objectclass($db);
-                    $objectforloop->thirdparty = $thirdparty;          // Force thirdparty on object (even if object was not loaded)
-                    $looparray[0]=$objectforloop;
-                }
-                //var_dump($looparray);exit;
+				$sendtobcc = GETPOST('sendtoccc');
+				if ($objectclass == 'Propal') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
+				if ($objectclass == 'Commande') 			$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
+				if ($objectclass == 'Facture') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
+				if ($objectclass == 'Supplier_Proposal') 	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
+				if ($objectclass == 'CommandeFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
+				if ($objectclass == 'FactureFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
+				if ($objectclass == 'Project') 			    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO));
+
+				// $listofqualifiedobj is array with key = object id and value is instance of qualified objects, for the current thirdparty (but thirdparty property is not loaded yet)
+				// $looparray will be an array with number of email to send for the current thirdparty (so 1 or n if n object for same thirdparty)
+				$looparray=array();
+				if (! $oneemailperrecipient)
+				{
+					$looparray = $listofqualifiedobj;
+					foreach ($looparray as $key => $objecttmp)
+					{
+					    $looparray[$key]->thirdparty = $thirdparty;   // Force thirdparty on object
+					}
+				}
+				else
+				{
+					$objectforloop=new $objectclass($db);
+					$objectforloop->thirdparty = $thirdparty;          // Force thirdparty on object (even if object was not loaded)
+					$looparray[0]=$objectforloop;
+				}
+				//var_dump($looparray);exit;
                 dol_syslog("We have set an array of ".count($looparray)." emails to send. oneemailperrecipient=".$oneemailperrecipient);
                 //var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
                 foreach ($looparray as $objectid => $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
-                {
-                    // Make substitution in email content
-                    $substitutionarray=getCommonSubstitutionArray($langs, 0, null, $objecttmp);
-                    $substitutionarray['__ID__']    = ($oneemailperrecipient ? join(', ', array_keys($listofqualifiedobj)) : $objecttmp->id);
-                    $substitutionarray['__REF__']   = ($oneemailperrecipient ? join(', ', $listofqualifiedref) : $objecttmp->ref);
-                    $substitutionarray['__EMAIL__'] = $thirdparty->email;
-                    $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+				{
+					// Make substitution in email content
+					$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $objecttmp);
+					$substitutionarray['__ID__']    = ($oneemailperrecipient ? join(', ',array_keys($listofqualifiedobj)) : $objecttmp->id);
+					$substitutionarray['__REF__']   = ($oneemailperrecipient ? join(', ',$listofqualifiedref) : $objecttmp->ref);
+					$substitutionarray['__EMAIL__'] = $thirdparty->email;
+					$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 
-                    $parameters=array('mode'=>'formemail');
+					$parameters=array('mode'=>'formemail');
 
-                    if ( ! empty($listofobjectthirdparties) ) {
-                        $parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
-                    }
-                    if ( ! empty($listofobjectref) ) {
-                        $parameters['listofobjectref'] = $listofobjectref;
-                    }
+					if ( ! empty( $listofobjectthirdparties ) ) {
+						$parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
+					}
+					if ( ! empty( $listofobjectref ) ) {
+						$parameters['listofobjectref'] = $listofobjectref;
+					}
 
-                    complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
+					complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
 
                     $subjectreplaced=make_substitutions($subject, $substitutionarray);
                     $messagereplaced=make_substitutions($message, $substitutionarray);
 
-                    $filepath = $attachedfiles['paths'];
-                    $filename = $attachedfiles['names'];
-                    $mimetype = $attachedfiles['mimes'];
+                    $attachedfiles=array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
+					if ($oneemailperrecipient)
+					{
+						// if "one email per recipient" is check we must collate $attachedfiles by thirdparty
+						if (is_array($attachedfilesThirdpartyObj[$thirdparty->id]) && count($attachedfilesThirdpartyObj[$thirdparty->id]))
+						{
+							foreach ($attachedfilesThirdpartyObj[$thirdparty->id] as $keyObjId =>  $objAttachedFiles){
+								// Create form object
+								$attachedfiles=array(
+									'paths'=>array_merge($attachedfiles['paths'], $objAttachedFiles['paths']),
+									'names'=>array_merge($attachedfiles['names'], $objAttachedFiles['names']),
+									'mimes'=>array_merge($attachedfiles['mimes'], $objAttachedFiles['mimes'])
+								);
+							}
+						}
+					}
+					elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])){
+						// Create form object
+						// if "one email per recipient" isn't check we must separate $attachedfiles by object
+						$attachedfiles=$attachedfilesThirdpartyObj[$thirdparty->id][$objectid];
+					}
 
-                    // Define the trackid when emails sent from the mass action
-                    if ($oneemailperrecipient)
-                    {
-                        $trackid='thi'.$thirdparty->id;
-                        if ($objecttmp->element == 'expensereport') $trackid='use'.$thirdparty->id;
-                        if ($objecttmp->element == 'holiday') $trackid='use'.$thirdparty->id;
-                    }
-                    else
-                    {
-                        $trackid=strtolower(get_class($objecttmp));
-                        if (get_class($objecttmp)=='Contrat')  $trackid='con';
-                        if (get_class($objecttmp)=='Propal')   $trackid='pro';
-                        if (get_class($objecttmp)=='Commande') $trackid='ord';
-                        if (get_class($objecttmp)=='Facture')  $trackid='inv';
-                        if (get_class($objecttmp)=='Supplier_Proposal')   $trackid='spr';
-                        if (get_class($objecttmp)=='CommandeFournisseur') $trackid='sor';
-                        if (get_class($objecttmp)=='FactureFournisseur')  $trackid='sin';
+					$filepath = $attachedfiles['paths'];
+					$filename = $attachedfiles['names'];
+					$mimetype = $attachedfiles['mimes'];
 
-                        $trackid.=$objecttmp->id;
-                    }
-                    //var_dump($filepath);
-                    //var_dump($trackid);exit;
-                    //var_dump($subjectreplaced);
+					// Define the trackid when emails sent from the mass action
+					if ($oneemailperrecipient)
+					{
+					    $trackid='thi'.$thirdparty->id;
+					    if ($objecttmp->element == 'expensereport') $trackid='use'.$thirdparty->id;
+					    if ($objecttmp->element == 'holiday') $trackid='use'.$thirdparty->id;
+					}
+					else
+					{
+					    $trackid=strtolower(get_class($objecttmp));
+					    if (get_class($objecttmp)=='Contrat')  $trackid='con';
+					    if (get_class($objecttmp)=='Propal')   $trackid='pro';
+					    if (get_class($objecttmp)=='Commande') $trackid='ord';
+					    if (get_class($objecttmp)=='Facture')  $trackid='inv';
+					    if (get_class($objecttmp)=='Supplier_Proposal')   $trackid='spr';
+					    if (get_class($objecttmp)=='CommandeFournisseur') $trackid='sor';
+					    if (get_class($objecttmp)=='FactureFournisseur')  $trackid='sin';
 
-                    // Send mail (substitutionarray must be done just before this)
+					    $trackid.=$objecttmp->id;
+					}
+					//var_dump($filepath);
+					//var_dump($trackid);exit;
+					//var_dump($subjectreplaced);
+
+					// Send mail (substitutionarray must be done just before this)
                     require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
                     $mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid);
-                    if ($mailfile->error)
-                    {
-                        $resaction.='<div class="error">'.$mailfile->error.'</div>';
-                    }
-                    else
-                    {
-                        $result=$mailfile->sendfile();
-                        if ($result)
-                        {
-                            $resaction.=$langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)).'<br>';		// Must not contain "
+					if ($mailfile->error)
+					{
+						$resaction.='<div class="error">'.$mailfile->error.'</div>';
+					}
+					else
+					{
+						$result=$mailfile->sendfile();
+						if ($result)
+						{
+							$resaction.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)).'<br>';		// Must not contain "
 
-                            $error=0;
+							$error=0;
 
-                            // Insert logs into agenda
+							// Insert logs into agenda
                             foreach($listofqualifiedobj as $objid2 => $objectobj2)
-                            {
+							{
                                 if ((! $oneemailperrecipient) && $objid2 != $objectid) continue;  // We discard this pass to avoid duplicate with other pass in looparray at higher level
 
                                 dol_syslog("Try to insert email event into agenda for objid=".$objid2." => objectobj=".get_class($objectobj2));
 
-                                /*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
-                                 if ($objectclass == 'Commande') $actiontypecode='AC_COM';
-                                 if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
-                                 if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
-                                 if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
-                                 if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
+								/*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
+	                            if ($objectclass == 'Commande') $actiontypecode='AC_COM';
+	                            if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
+	                            if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
+	                            if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
+	                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
 
-                                $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-                                if ($message)
-                                {
-                                    if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+								$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+								if ($message)
+								{
+									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
                                     $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subjectreplaced);
-                                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
                                     $actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
-                                }
-                                $actionmsg2='';
+								}
+								$actionmsg2='';
 
-                                // Initialisation donnees
+								// Initialisation donnees
                                 $objectobj2->sendtoid		= 0;
                                 $objectobj2->actionmsg		= $actionmsg;  // Long text
                                 $objectobj2->actionmsg2		= $actionmsg2; // Short text
                                 $objectobj2->fk_element		= $objid2;
                                 $objectobj2->elementtype	= $objectobj2->element;
 
-                                $triggername = strtoupper(get_class($objectobj2)) .'_SENTBYMAIL';
-                                if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYMAIL';
-                                if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYMAIL';
-                                if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYMAIL';
-                                if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYMAIL';
-                                if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYMAIL';
-                                if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
-                                if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYMAIL';
-                                if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYMAIL';
+								$triggername = strtoupper(get_class($objectobj2)) .'_SENTBYMAIL';
+								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYMAIL';
+								if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYMAIL';
+								if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYMAIL';
+								if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYMAIL';
+								if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYMAIL';
+								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYMAIL';
+								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYMAIL';
 
-                                if (! empty($triggername))
-                                {
-                                    // Appel des triggers
+								if (! empty($triggername))
+								{
+									// Appel des triggers
                                     include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-                                    $interface=new Interfaces($db);
+									$interface=new Interfaces($db);
                                     $result=$interface->run_triggers($triggername, $objectobj2, $user, $langs, $conf);
-                                    if ($result < 0) { $error++; $errors=$interface->errors; }
-                                    // Fin appel triggers
+									if ($result < 0) { $error++; $errors=$interface->errors; }
+									// Fin appel triggers
 
-                                    if ($error)
-                                    {
-                                        setEventMessages($db->lasterror(), $errors, 'errors');
-                                        dol_syslog("Error in trigger ".$triggername.' '.$db->lasterror(), LOG_ERR);
-                                    }
-                                }
-                            }
+									if ($error)
+									{
+										setEventMessages($db->lasterror(), $errors, 'errors');
+										dol_syslog("Error in trigger ".$triggername.' '.$db->lasterror(), LOG_ERR);
+									}
+								}
 
-                            $nbsent++;   // Nb of email sent (may be lower than number of record selected if we group thirdparties)
-                        }
-                        else
-                        {
-                            $langs->load("other");
-                            if ($mailfile->error)
-                            {
-                                $resaction.=$langs->trans('ErrorFailedToSendMail', $from, $sendto);
-                                $resaction.='<br><div class="error">'.$mailfile->error.'</div>';
-                            }
-                            else
-                            {
-                                $resaction.='<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
-                            }
-                        }
-                    }
-                }
-            }
-        }
+								$nbsent++;   // Nb of object sent
+							}
+						}
+						else
+						{
+							$langs->load("other");
+							if ($mailfile->error)
+							{
+								$resaction.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+								$resaction.='<br><div class="error">'.$mailfile->error.'</div>';
+							}
+							else
+							{
+								$resaction.='<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
+							}
+						}
+					}
+				}
+			}
+		}
 
-        $resaction.=($resaction?'<br>':$resaction);
-        $resaction.='<strong>'.$langs->trans("ResultOfMailSending").':</strong><br>'."\n";
-        $resaction.=$langs->trans("NbSelected").': '.count($toselect)."\n<br>";
-        $resaction.=$langs->trans("NbIgnored").': '.($nbignored?$nbignored:0)."\n<br>";
-        $resaction.=$langs->trans("NbSent").': '.($nbsent?$nbsent:0)."\n<br>";
+		$resaction.=($resaction?'<br>':$resaction);
+		$resaction.='<strong>'.$langs->trans("ResultOfMailSending").':</strong><br>'."\n";
+		$resaction.=$langs->trans("NbSelected").': '.count($toselect)."\n<br>";
+		$resaction.=$langs->trans("NbIgnored").': '.($nbignored?$nbignored:0)."\n<br>";
+		$resaction.=$langs->trans("NbSent").': '.($nbsent?$nbsent:0)."\n<br>";
 
-        if ($nbsent)
-        {
-            $action='';	// Do not show form post if there was at least one successfull sent
-            //setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
-            setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
-            setEventMessages($resaction, null, 'mesgs');
-        }
-        else
-        {
-            //setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
-            setEventMessages($resaction, null, 'warnings');
-        }
+		if ($nbsent)
+		{
+			$action='';	// Do not show form post if there was at least one successfull sent
+			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
+			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
+			setEventMessages($resaction, null, 'mesgs');
+		}
+		else
+		{
+			//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 ($massaction == 'confirm_createbills')   // Create bills from orders
 {
-    $orders = GETPOST('toselect', 'array');
-    $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-    $validate_invoices = GETPOST('validate_invoices', 'int');
+	$orders = GETPOST('toselect','array');
+	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+	$validate_invoices = GETPOST('validate_invoices', 'int');
 
-    $TFact = array();
-    $TFactThird = array();
+	$TFact = array();
+	$TFactThird = array();
 
-    $nb_bills_created = 0;
+	$nb_bills_created = 0;
 
-    $db->begin();
+	$db->begin();
 
-    foreach($orders as $id_order)
-    {
-        $cmd = new Commande($db);
-        if ($cmd->fetch($id_order) <= 0) continue;
+	foreach($orders as $id_order)
+	{
+		$cmd = new Commande($db);
+		if ($cmd->fetch($id_order) <= 0) continue;
 
-        $objecttmp = new Facture($db);
-        if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
-        else {
-            // Load extrafields of order
-            $cmd->fetch_optionals();
+		$objecttmp = new Facture($db);
+		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+		else {
+			// Load extrafields of order
+			$cmd->fetch_optionals();
 
-            $objecttmp->socid = $cmd->socid;
-            $objecttmp->type = Facture::TYPE_STANDARD;
-            $objecttmp->cond_reglement_id	= $cmd->cond_reglement_id;
-            $objecttmp->mode_reglement_id	= $cmd->mode_reglement_id;
-            $objecttmp->fk_project			= $cmd->fk_project;
+			$objecttmp->socid = $cmd->socid;
+			$objecttmp->type = Facture::TYPE_STANDARD;
+			$objecttmp->cond_reglement_id	= $cmd->cond_reglement_id;
+			$objecttmp->mode_reglement_id	= $cmd->mode_reglement_id;
+			$objecttmp->fk_project			= $cmd->fk_project;
             $objecttmp->multicurrency_code  = $cmd->multicurrency_code;
             if (empty($createbills_onebythird)) $objecttmp->ref_client = $cmd->ref_client;
 
             $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
             if (empty($datefacture))
-            {
-                $datefacture = dol_now();
-            }
+			{
+			    $datefacture = dol_now();
+			}
 
-            $objecttmp->date = $datefacture;
-            $objecttmp->origin    = 'commande';
-            $objecttmp->origin_id = $id_order;
+			$objecttmp->date = $datefacture;
+			$objecttmp->origin    = 'commande';
+			$objecttmp->origin_id = $id_order;
 
-            $objecttmp->array_options = $cmd->array_options;	// Copy extrafields
+			$objecttmp->array_options = $cmd->array_options;	// Copy extrafields
 
-            $res = $objecttmp->create($user);
+			$res = $objecttmp->create($user);
 
-            if($res > 0) $nb_bills_created++;
-        }
+			if($res > 0) $nb_bills_created++;
+		}
 
-        if ($objecttmp->id > 0)
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-            $sql.= "fk_source";
-            $sql.= ", sourcetype";
-            $sql.= ", fk_target";
-            $sql.= ", targettype";
-            $sql.= ") VALUES (";
-            $sql.= $id_order;
-            $sql.= ", '".$objecttmp->origin."'";
-            $sql.= ", ".$objecttmp->id;
-            $sql.= ", '".$objecttmp->element."'";
-            $sql.= ")";
+		if ($objecttmp->id > 0)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+			$sql.= "fk_source";
+			$sql.= ", sourcetype";
+			$sql.= ", fk_target";
+			$sql.= ", targettype";
+			$sql.= ") VALUES (";
+			$sql.= $id_order;
+			$sql.= ", '".$objecttmp->origin."'";
+			$sql.= ", ".$objecttmp->id;
+			$sql.= ", '".$objecttmp->element."'";
+			$sql.= ")";
 
-            if (! $db->query($sql))
-            {
-                $error++;
-            }
+			if (! $db->query($sql))
+			{
+				$error++;
+			}
 
-            if (! $error)
-            {
-                $lines = $cmd->lines;
-                if (empty($lines) && method_exists($cmd, 'fetch_lines'))
-                {
-                    $cmd->fetch_lines();
-                    $lines = $cmd->lines;
-                }
+			if (! $error)
+			{
+				$lines = $cmd->lines;
+				if (empty($lines) && method_exists($cmd, 'fetch_lines'))
+				{
+					$cmd->fetch_lines();
+					$lines = $cmd->lines;
+				}
 
-                $fk_parent_line=0;
-                $num=count($lines);
+				$fk_parent_line=0;
+				$num=count($lines);
 
-                for ($i=0;$i<$num;$i++)
-                {
-                    $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
-                    // If we build one invoice for several order, we must put the invoice of order on the line
-                    if (! empty($createbills_onebythird))
-                    {
-                        $desc=dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day', $langs));
-                    }
+				for ($i=0;$i<$num;$i++)
+				{
+					$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+					// If we build one invoice for several order, we must put the invoice of order on the line
+					if (! empty($createbills_onebythird))
+					{
+					    $desc=dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day', $langs));
+					}
 
-                    if ($lines[$i]->subprice < 0)
-                    {
-                        // Negative line, we create a discount line
-                        $discount = new DiscountAbsolute($db);
-                        $discount->fk_soc=$objecttmp->socid;
-                        $discount->amount_ht=abs($lines[$i]->total_ht);
-                        $discount->amount_tva=abs($lines[$i]->total_tva);
-                        $discount->amount_ttc=abs($lines[$i]->total_ttc);
-                        $discount->tva_tx=$lines[$i]->tva_tx;
-                        $discount->fk_user=$user->id;
-                        $discount->description=$desc;
-                        $discountid=$discount->create($user);
-                        if ($discountid > 0)
-                        {
-                            $result=$objecttmp->insert_discount($discountid);
-                            //$result=$discount->link_to_invoice($lineid,$id);
-                        }
-                        else
-                        {
-                            setEventMessages($discount->error, $discount->errors, 'errors');
-                            $error++;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        // Positive line
-                        $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-                        // Date start
-                        $date_start=false;
-                        if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
-                        if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-                        if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
-                        //Date end
-                        $date_end=false;
-                        if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
-                        if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-                        if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
-                        // Reset fk_parent_line for no child products and special product
-                        if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
-                        {
-                            $fk_parent_line = 0;
-                        }
+					if ($lines[$i]->subprice < 0)
+					{
+						// Negative line, we create a discount line
+						$discount = new DiscountAbsolute($db);
+						$discount->fk_soc=$objecttmp->socid;
+						$discount->amount_ht=abs($lines[$i]->total_ht);
+						$discount->amount_tva=abs($lines[$i]->total_tva);
+						$discount->amount_ttc=abs($lines[$i]->total_ttc);
+						$discount->tva_tx=$lines[$i]->tva_tx;
+						$discount->fk_user=$user->id;
+						$discount->description=$desc;
+						$discountid=$discount->create($user);
+						if ($discountid > 0)
+						{
+							$result=$objecttmp->insert_discount($discountid);
+							//$result=$discount->link_to_invoice($lineid,$id);
+						}
+						else
+						{
+							setEventMessages($discount->error, $discount->errors, 'errors');
+							$error++;
+							break;
+						}
+					}
+					else
+					{
+						// Positive line
+						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+						// Date start
+						$date_start=false;
+						if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
+						if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+						if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+						//Date end
+						$date_end=false;
+						if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
+						if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+						if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+						// Reset fk_parent_line for no child products and special product
+						if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+						{
+							$fk_parent_line = 0;
+						}
 
-                        // Extrafields
-                        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-                            $lines[$i]->fetch_optionals($lines[$i]->rowid);
-                            $array_options = $lines[$i]->array_options;
-                        }
+						// Extrafields
+						if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
+							$lines[$i]->fetch_optionals($lines[$i]->rowid);
+							$array_options = $lines[$i]->array_options;
+						}
 
-                        $result = $objecttmp->addline(
-                            $desc,
-                            $lines[$i]->subprice,
-                            $lines[$i]->qty,
-                            $lines[$i]->tva_tx,
-                            $lines[$i]->localtax1_tx,
-                            $lines[$i]->localtax2_tx,
-                            $lines[$i]->fk_product,
-                            $lines[$i]->remise_percent,
-                            $date_start,
-                            $date_end,
-                            0,
-                            $lines[$i]->info_bits,
-                            $lines[$i]->fk_remise_except,
-                            'HT',
-                            0,
-                            $product_type,
-                            $ii,
-                            $lines[$i]->special_code,
-                            $objecttmp->origin,
-                            $lines[$i]->rowid,
-                            $fk_parent_line,
-                            $lines[$i]->fk_fournprice,
-                            $lines[$i]->pa_ht,
-                            $lines[$i]->label,
-                            $array_options
-                            );
-                        if ($result > 0)
-                        {
-                            $lineid=$result;
-                        }
-                        else
-                        {
-                            $lineid=0;
-                            $error++;
-                            break;
-                        }
-                        // Defined the new fk_parent_line
-                        if ($result > 0 && $lines[$i]->product_type == 9)
-                        {
-                            $fk_parent_line = $result;
-                        }
-                    }
-                }
-            }
-        }
+						$result = $objecttmp->addline(
+							$desc,
+							$lines[$i]->subprice,
+							$lines[$i]->qty,
+							$lines[$i]->tva_tx,
+							$lines[$i]->localtax1_tx,
+							$lines[$i]->localtax2_tx,
+							$lines[$i]->fk_product,
+							$lines[$i]->remise_percent,
+							$date_start,
+							$date_end,
+							0,
+							$lines[$i]->info_bits,
+							$lines[$i]->fk_remise_except,
+							'HT',
+							0,
+							$product_type,
+							$ii,
+							$lines[$i]->special_code,
+							$objecttmp->origin,
+							$lines[$i]->rowid,
+							$fk_parent_line,
+							$lines[$i]->fk_fournprice,
+							$lines[$i]->pa_ht,
+							$lines[$i]->label,
+							$array_options
+							);
+						if ($result > 0)
+						{
+							$lineid=$result;
+						}
+						else
+						{
+							$lineid=0;
+							$error++;
+							break;
+						}
+						// Defined the new fk_parent_line
+						if ($result > 0 && $lines[$i]->product_type == 9)
+						{
+							$fk_parent_line = $result;
+						}
+					}
+				}
+			}
+		}
 
-        //$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
+		//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
 
-        if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $objecttmp;
-        else $TFact[$objecttmp->id] = $objecttmp;
-    }
+		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $objecttmp;
+		else $TFact[$objecttmp->id] = $objecttmp;
+	}
 
-    // Build doc with all invoices
-    $TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-    $toselect = array();
+	// Build doc with all invoices
+	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+	$toselect = array();
 
-    if (! $error && $validate_invoices)
-    {
-        $massaction = $action = 'builddoc';
+	if (! $error && $validate_invoices)
+	{
+		$massaction = $action = 'builddoc';
 
-        foreach($TAllFact as &$objecttmp)
-        {
-            $result = $objecttmp->validate($user);
-            if ($result <= 0)
-            {
-                $error++;
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                break;
-            }
+		foreach($TAllFact as &$objecttmp)
+		{
+			$result = $objecttmp->validate($user);
+			if ($result <= 0)
+			{
+				$error++;
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				break;
+			}
 
-            $id = $objecttmp->id; // For builddoc action
-            $object = $objecttmp;
+			$id = $objecttmp->id; // For builddoc action
+			$object = $objecttmp;
 
-            // Builddoc
-            $donotredirect = 1;
-            $upload_dir = $conf->facture->dir_output;
-            $permissioncreate=$user->rights->facture->creer;
+			// Builddoc
+			$donotredirect = 1;
+			$upload_dir = $conf->facture->dir_output;
+			$permissioncreate=$user->rights->facture->creer;
 
-            // Call action to build doc
-            $savobject = $object;
-            $object = $objecttmp;
-            include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-            $object = $savobject;
-        }
+			// Call action to build doc
+			$savobject = $object;
+      			$object = $objecttmp;
+			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+			$object = $savobject;
+		}
 
-        $massaction = $action = 'confirm_createbills';
-    }
+		$massaction = $action = 'confirm_createbills';
+	}
 
-    if (! $error)
-    {
-        $db->commit();
+	if (! $error)
+	{
+		$db->commit();
         setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
 
-        // Make a redirect to avoid to bill twice if we make a refresh or back
-        $param='';
-        if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-        if ($sall)					$param.='&sall='.urlencode($sall);
-        if ($socid > 0)             $param.='&socid='.urlencode($socid);
-        if ($viewstatut != '')      $param.='&viewstatut='.urlencode($viewstatut);
-        if ($search_orderday)      		$param.='&search_orderday='.urlencode($search_orderday);
-        if ($search_ordermonth)      		$param.='&search_ordermonth='.urlencode($search_ordermonth);
-        if ($search_orderyear)       		$param.='&search_orderyear='.urlencode($search_orderyear);
-        if ($search_deliveryday)   		$param.='&search_deliveryday='.urlencode($search_deliveryday);
-        if ($search_deliverymonth)   		$param.='&search_deliverymonth='.urlencode($search_deliverymonth);
-        if ($search_deliveryyear)    		$param.='&search_deliveryyear='.urlencode($search_deliveryyear);
-        if ($search_ref)      		$param.='&search_ref='.urlencode($search_ref);
-        if ($search_company)  		$param.='&search_company='.urlencode($search_company);
-        if ($search_ref_customer)	$param.='&search_ref_customer='.urlencode($search_ref_customer);
-        if ($search_user > 0) 		$param.='&search_user='.urlencode($search_user);
-        if ($search_sale > 0) 		$param.='&search_sale='.urlencode($search_sale);
-        if ($search_total_ht != '') $param.='&search_total_ht='.urlencode($search_total_ht);
-        if ($search_total_vat != '') $param.='&search_total_vat='.urlencode($search_total_vat);
-        if ($search_total_ttc != '') $param.='&search_total_ttc='.urlencode($search_total_ttc);
-        if ($search_project_ref >= 0)  	$param.="&search_project_ref=".urlencode($search_project_ref);
-        if ($show_files)            $param.='&show_files=' .urlencode($show_files);
-        if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
-        if ($billed != '')			$param.='&billed='.urlencode($billed);
+		// Make a redirect to avoid to bill twice if we make a refresh or back
+		$param='';
+		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+		if ($sall)					$param.='&sall='.urlencode($sall);
+		if ($socid > 0)             $param.='&socid='.urlencode($socid);
+		if ($viewstatut != '')      $param.='&viewstatut='.urlencode($viewstatut);
+		if ($search_orderday)      		$param.='&search_orderday='.urlencode($search_orderday);
+		if ($search_ordermonth)      		$param.='&search_ordermonth='.urlencode($search_ordermonth);
+		if ($search_orderyear)       		$param.='&search_orderyear='.urlencode($search_orderyear);
+		if ($search_deliveryday)   		$param.='&search_deliveryday='.urlencode($search_deliveryday);
+		if ($search_deliverymonth)   		$param.='&search_deliverymonth='.urlencode($search_deliverymonth);
+		if ($search_deliveryyear)    		$param.='&search_deliveryyear='.urlencode($search_deliveryyear);
+		if ($search_ref)      		$param.='&search_ref='.urlencode($search_ref);
+		if ($search_company)  		$param.='&search_company='.urlencode($search_company);
+		if ($search_ref_customer)	$param.='&search_ref_customer='.urlencode($search_ref_customer);
+		if ($search_user > 0) 		$param.='&search_user='.urlencode($search_user);
+		if ($search_sale > 0) 		$param.='&search_sale='.urlencode($search_sale);
+		if ($search_total_ht != '') $param.='&search_total_ht='.urlencode($search_total_ht);
+		if ($search_total_vat != '') $param.='&search_total_vat='.urlencode($search_total_vat);
+		if ($search_total_ttc != '') $param.='&search_total_ttc='.urlencode($search_total_ttc);
+		if ($search_project_ref >= 0)  	$param.="&search_project_ref=".urlencode($search_project_ref);
+		if ($show_files)            $param.='&show_files=' .urlencode($show_files);
+		if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
+		if ($billed != '')			$param.='&billed='.urlencode($billed);
 
-        header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
-        exit;
-    }
-    else
-    {
-        $db->rollback();
-        $action='create';
-        $_GET["origin"]=$_POST["origin"];
-        $_GET["originid"]=$_POST["originid"];
-        setEventMessages("Error", null, 'errors');
-        $error++;
-    }
+		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
+		exit;
+	}
+	else
+	{
+		$db->rollback();
+		$action='create';
+		$_GET["origin"]=$_POST["origin"];
+		$_GET["originid"]=$_POST["originid"];
+		setEventMessages("Error", null, 'errors');
+		$error++;
+	}
 }
 
 if (!$error && $massaction == 'cancelorders')
 {
-    $db->begin();
 
-    $nbok = 0;
+	$db->begin();
+
+	$nbok = 0;
 
 
-    $orders = GETPOST('toselect', 'array');
-    foreach ($orders as $id_order)
-    {
+	$orders = GETPOST('toselect', 'array');
+	foreach ($orders as $id_order)
+	{
 
-        $cmd = new Commande($db);
-        if ($cmd->fetch($id_order) <= 0)
-            continue;
+		$cmd = new Commande($db);
+		if ($cmd->fetch($id_order) <= 0)
+			continue;
 
-            if ($cmd->statut != Commande::STATUS_VALIDATED)
-            {
-                $langs->load('errors');
-                setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
-                $error++;
-                break;
-            }
-            else
-                $result = $cmd->cancel();
+		if ($cmd->statut != Commande::STATUS_VALIDATED)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
+			$error++;
+			break;
+		}
+		else
+			$result = $cmd->cancel();
 
-                if ($result < 0)
-                {
-                    setEventMessages($cmd->error, $cmd->errors, 'errors');
-                    $error++;
-                    break;
-                }
-                else
-                    $nbok++;
-    }
-    if (!$error)
-    {
-        if ($nbok > 1)
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-            else
-                setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-                $db->commit();
-    }
-    else
-    {
-        $db->rollback();
-    }
+		if ($result < 0)
+		{
+			setEventMessages($cmd->error, $cmd->errors, 'errors');
+			$error++;
+			break;
+		}
+		else
+			$nbok++;
+	}
+	if (!$error)
+	{
+		if ($nbok > 1)
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		else
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
 }
 
 
 if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search'))
 {
-    if (empty($diroutputmassaction))
-    {
-        dol_print_error(null, 'include of actions_massactions.inc.php is done but var $diroutputmassaction was not defined');
-        exit;
-    }
+	if (empty($diroutputmassaction))
+	{
+		dol_print_error(null, 'include of actions_massactions.inc.php is done but var $diroutputmassaction was not defined');
+		exit;
+	}
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-    $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
-        $result=$objecttmp->fetch($toselectid);
-        if ($result > 0)
-        {
-            $listofobjectid[$toselectid]=$toselectid;
-            $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-            $listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
-            $listofobjectref[$toselectid]=$objecttmp->ref;
-        }
-    }
+	$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
+		$result=$objecttmp->fetch($toselectid);
+		if ($result > 0)
+		{
+			$listofobjectid[$toselectid]=$toselectid;
+			$thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
+			$listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
+			$listofobjectref[$toselectid]=$objecttmp->ref;
+		}
+	}
 
-    $arrayofinclusion=array();
-    foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'\.pdf$';
-    foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9-_]+\.pdf$';	// To include PDF generated from ODX files
-    $listoffiles = dol_dir_list($uploaddir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
+	$arrayofinclusion=array();
+	foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf),'/').'\.pdf$';
+	foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf),'/').'_[a-zA-Z0-9-_]+\.pdf$';	// To include PDF generated from ODX files
+	$listoffiles = dol_dir_list($uploaddir,'all',1,implode('|',$arrayofinclusion),'\.meta$|\.png','date',SORT_DESC,0,true);
 
-    // build list of files with full path
-    $files = array();
-    foreach($listofobjectref as $basename)
-    {
-        $basename = dol_sanitizeFileName($basename);
-        foreach($listoffiles as $filefound)
-        {
-            if (strstr($filefound["name"], $basename))
-            {
-                $files[] = $uploaddir.'/'.$basename.'/'.$filefound["name"];
-                break;
-            }
-        }
-    }
+	// build list of files with full path
+	$files = array();
+	foreach($listofobjectref as $basename)
+	{
+		$basename = dol_sanitizeFileName($basename);
+		foreach($listoffiles as $filefound)
+		{
+			if (strstr($filefound["name"],$basename))
+			{
+				$files[] = $uploaddir.'/'.$basename.'/'.$filefound["name"];
+				break;
+			}
+		}
+	}
 
-    // Define output language (Here it is not used because we do only merging existing PDF)
-    $outputlangs = $langs;
-    $newlang='';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09');
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$objecttmp->thirdparty->default_lang;
-    if (! empty($newlang)) {
-        $outputlangs = new Translate("", $conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
+	// Define output language (Here it is not used because we do only merging existing PDF)
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$objecttmp->thirdparty->default_lang;
+	if (! empty($newlang)) {
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
 
-    if (!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT))
-    {
-        // Create output dir if not exists
-        dol_mkdir($diroutputmassaction);
+	if (!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT))
+	{
+		// Create output dir if not exists
+		dol_mkdir($diroutputmassaction);
 
-        // Defined name of merged file
-        $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
-        $filename=preg_replace('/\s/', '_', $filename);
+		// Defined name of merged file
+		$filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+		$filename=preg_replace('/\s/','_',$filename);
 
-        // Save merged file
-        if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
-        {
-            if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-            else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
-        }
-        if ($year) $filename.='_'.$year;
-        if ($month) $filename.='_'.$month;
+		// Save merged file
+		if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
+		{
+			if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+			else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+		}
+		if ($year) $filename.='_'.$year;
+		if ($month) $filename.='_'.$month;
 
-        if (count($files)>0)
-        {
-            $now=dol_now();
-            $file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now, 'dayhourlog').'.pdf';
+		if (count($files)>0)
+		{
+			$now=dol_now();
+			$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
 
-            $input_files = '';
-            foreach($files as $f) {
-                $input_files.=' '.escapeshellarg($f);
-            }
+			$input_files = '';
+			foreach($files as $f) {
+				$input_files.=' '.escapeshellarg($f);
+			}
 
-            $cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
-            exec($cmd);
+			$cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
+			exec($cmd);
 
-            if (! empty($conf->global->MAIN_UMASK))
-                @chmod($file, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK))
+				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-                $langs->load("exports");
-                setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
-        }
-        else
-        {
-            setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
-        }
-    }
-    else {
-        // Create empty PDF
-        $formatarray=pdf_getFormat();
-        $page_largeur = $formatarray['width'];
-        $page_hauteur = $formatarray['height'];
-        $format = array($page_largeur,$page_hauteur);
+			$langs->load("exports");
+			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+		}
+		else
+		{
+			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+		}
+	}
+	else {
+		// Create empty PDF
+		$formatarray=pdf_getFormat();
+		$page_largeur = $formatarray['width'];
+		$page_hauteur = $formatarray['height'];
+		$format = array($page_largeur,$page_hauteur);
 
-        $pdf=pdf_getInstance($format);
+		$pdf=pdf_getInstance($format);
 
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+		if (class_exists('TCPDF'))
+		{
+			$pdf->setPrintHeader(false);
+			$pdf->setPrintFooter(false);
+		}
+		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-        // Add all others
-        foreach($files as $file)
-        {
-            // Charge un document PDF depuis un fichier.
-            $pagecount = $pdf->setSourceFile($file);
-            for ($i = 1; $i <= $pagecount; $i++)
-            {
-                $tplidx = $pdf->importPage($i);
-                $s = $pdf->getTemplatesize($tplidx);
-                $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-                $pdf->useTemplate($tplidx);
-            }
-        }
+		// Add all others
+		foreach($files as $file)
+		{
+			// Charge un document PDF depuis un fichier.
+			$pagecount = $pdf->setSourceFile($file);
+			for ($i = 1; $i <= $pagecount; $i++)
+			{
+				$tplidx = $pdf->importPage($i);
+				$s = $pdf->getTemplatesize($tplidx);
+				$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+				$pdf->useTemplate($tplidx);
+			}
+		}
 
-        // Create output dir if not exists
-        dol_mkdir($diroutputmassaction);
+		// Create output dir if not exists
+		dol_mkdir($diroutputmassaction);
 
-        // Defined name of merged file
-        $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
-        $filename=preg_replace('/\s/', '_', $filename);
+		// Defined name of merged file
+		$filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+		$filename=preg_replace('/\s/','_',$filename);
 
-        // Save merged file
-        if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
-        {
-            if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-            else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
-        }
-        if ($year) $filename.='_'.$year;
-        if ($month) $filename.='_'.$month;
-        if ($pagecount)
-        {
-            $now=dol_now();
-            $file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now, 'dayhourlog').'.pdf';
-            $pdf->Output($file, 'F');
-            if (! empty($conf->global->MAIN_UMASK))
-                @chmod($file, octdec($conf->global->MAIN_UMASK));
+		// Save merged file
+		if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
+		{
+			if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+			else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+		}
+		if ($year) $filename.='_'.$year;
+		if ($month) $filename.='_'.$month;
+		if ($pagecount)
+		{
+			$now=dol_now();
+			$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+			$pdf->Output($file,'F');
+			if (! empty($conf->global->MAIN_UMASK))
+				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-                $langs->load("exports");
-                setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
-        }
-        else
-        {
-            setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
-        }
-    }
+			$langs->load("exports");
+			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+		}
+		else
+		{
+		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+		}
+	}
 }
 
 // Remove a file from massaction area
 if ($action == 'remove_file')
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    $langs->load("other");
-    $upload_dir = $diroutputmassaction;
-    $file = $upload_dir . '/' . GETPOST('file');
-    $ret=dol_delete_file($file);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
-    $action='';
+	$langs->load("other");
+	$upload_dir = $diroutputmassaction;
+	$file = $upload_dir . '/' . GETPOST('file');
+	$ret=dol_delete_file($file);
+	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	$action='';
 }
 
 // Validate records
 if (! $error && $massaction == 'validate' && $permtocreate)
 {
-    $objecttmp=new $objectclass($db);
+	$objecttmp=new $objectclass($db);
 
-    if ($objecttmp->element == 'invoice' && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
-    {
-        $langs->load("errors");
-        setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
-        $error++;
-    }
-    if ($objecttmp->element == 'invoice_supplier' && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-    {
-        $langs->load("errors");
-        setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
-        $error++;
-    }
-    if (! $error)
-    {
-        $db->begin();
+	if ($objecttmp->element == 'invoice' && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
+	{
+		$langs->load("errors");
+		setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
+		$error++;
+	}
+	if ($objecttmp->element == 'invoice_supplier' && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
+	{
+		$langs->load("errors");
+		setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
+		$error++;
+	}
+	if (! $error)
+	{
+		$db->begin();
 
-        $nbok = 0;
-        foreach($toselect as $toselectid)
-        {
-            $result=$objecttmp->fetch($toselectid);
-            if ($result > 0)
-            {
-                //if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
-                //else
-                $result = $objecttmp->validate($user);
-                if ($result == 0)
-                {
-                    $langs->load("errors");
-                    setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
-                    $error++;
-                    break;
-                }
-                elseif ($result < 0)
-                {
-                    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                    $error++;
-                    break;
-                }
-                else $nbok++;
-            }
-            else
-            {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            }
-        }
+		$nbok = 0;
+		foreach($toselect as $toselectid)
+		{
+			$result=$objecttmp->fetch($toselectid);
+			if ($result > 0)
+			{
+				//if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
+				//else
+				$result = $objecttmp->validate($user);
+				if ($result == 0)
+				{
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
+					$error++;
+					break;
+				}
+				elseif ($result < 0)
+				{
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+					$error++;
+					break;
+				}
+				else $nbok++;
+			}
+			else
+			{
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			}
+		}
 
-        if (! $error)
-        {
-            if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-            else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
-        }
-        //var_dump($listofobjectthirdparties);exit;
-    }
+		if (! $error)
+		{
+			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+		//var_dump($listofobjectthirdparties);exit;
+	}
 }
 // Closed records
 if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclose) {
@@ -1144,9 +1168,9 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclo
     if (!$error) {
         if ($nbok > 1)
             setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-            else
-                setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-                $db->commit();
+        else
+            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        $db->commit();
     }
     else {
         $db->rollback();
@@ -1155,66 +1179,66 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclo
 // Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before)
 if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permtodelete)
 {
-    $db->begin();
+	$db->begin();
 
-    $objecttmp=new $objectclass($db);
-    $nbok = 0;
-    foreach($toselect as $toselectid)
-    {
-        $result=$objecttmp->fetch($toselectid);
-        if ($result > 0)
-        {
-            // Refuse deletion for some objects/status
-            if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT)
-            {
-                $langs->load("errors");
-                $nbignored++;
-                $resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction', $objecttmp->ref).'</div><br>';
-                continue;
-            }
+	$objecttmp=new $objectclass($db);
+	$nbok = 0;
+	foreach($toselect as $toselectid)
+	{
+		$result=$objecttmp->fetch($toselectid);
+		if ($result > 0)
+		{
+			// Refuse deletion for some objects/status
+			if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT)
+			{
+				$langs->load("errors");
+				$nbignored++;
+				$resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$objecttmp->ref).'</div><br>';
+				continue;
+			}
 
-            if ($objectclass == "Task" && $objecttmp->hasChildren() > 0)
-            {
-                $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET fk_task_parent = 0 WHERE fk_task_parent = ".$objecttmp->id;
-                $res = $db->query($sql);
+			if ($objectclass == "Task" && $objecttmp->hasChildren() > 0)
+			{
+				$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET fk_task_parent = 0 WHERE fk_task_parent = ".$objecttmp->id;
+				$res = $db->query($sql);
 
-                if (!$res)
-                {
-                    setEventMessage('ErrorRecordParentingNotModified', 'errors');
-                    $error++;
-                }
-            }
+				if (!$res)
+				{
+					setEventMessage('ErrorRecordParentingNotModified', 'errors');
+					$error++;
+				}
+			}
 
-            if (in_array($objecttmp->element, array('societe', 'member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
-            else $result = $objecttmp->delete($user);
+			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');
-                $error++;
-                break;
-            }
-            else $nbok++;
-        }
-        else
-        {
-            setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-            $error++;
-            break;
-        }
-    }
+			if ($result <= 0)
+			{
+			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			    $error++;
+			    break;
+			}
+			else $nbok++;
+		}
+		else
+		{
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
 
-    if (! $error)
-    {
-        if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
-        else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
-        $db->commit();
-    }
-    else
-    {
-        $db->rollback();
-    }
-    //var_dump($listofobjectthirdparties);exit;
+	if (! $error)
+	{
+		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
+	//var_dump($listofobjectthirdparties);exit;
 }
 
 // Generate document foreach object according to model linked to object
@@ -1233,12 +1257,12 @@ if (! $error && $massaction == 'generate_doc' && $permtoread)
             $outputlangs = $langs;
             $newlang='';
 
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09');
+            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
             if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->thirdparty->default_lang)) $newlang=$objecttmp->thirdparty->default_lang;  // for proposal, order, invoice, ...
             if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) $newlang=$objecttmp->default_lang;                  // for thirdparty
             if (! empty($newlang))
             {
-                $outputlangs = new Translate("", $conf);
+                $outputlangs = new Translate("",$conf);
                 $outputlangs->setDefaultLang($newlang);
             }
 
@@ -1283,5 +1307,8 @@ $parameters['uploaddir']=$uploaddir;
 $parameters['massaction']=$massaction;
 $parameters['diroutputmassaction']=$diroutputmassaction;
 
-$reshook=$hookmanager->executeHooks('doMassActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook=$hookmanager->executeHooks('doMassActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9c5812069b7..c966f39680b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6519,7 +6519,7 @@ abstract class CommonObject
 				    jQuery(document).ready(function() {
 				    	function showOptions(child_list, parent_list)
 				    	{
-				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
+				    		var val = $("select[name=\""+parent_list+"\"]").val();
 				    		var parentVal = parent_list + ":" + val;
 							if(val > 0) {
 					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 1e4ff4b353f..e0d03d970d0 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -936,7 +936,6 @@ class FormMail extends Form
 					$defaultmessage=preg_replace("/^(<br>)+/", "", $defaultmessage);
 					$defaultmessage=preg_replace("/^\n+/", "", $defaultmessage);
 				}
-
 				$out.= '<tr>';
 				$out.= '<td valign="top">';
 				$out.=$form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a86a4a428f0..36514aafd8e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1790,7 +1790,7 @@ else
 				if (! empty($object->email))
 				{
 					$langs->load("mails");
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init#presend">'.$langs->trans('SendMail').'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 				}
 				else
 				{