alxarafe / alixar

dolibarr/htdocs/core/ajax/vatrates.php

Indentation +18 added lines, -18 removed lines

@@ -43,28 +43,28 @@
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
 {
-	$form = new Form($db);
-	$soc = new Societe($db);
+    $form = new Form($db);
+    $soc = new Societe($db);
 
-	$soc->fetch($id);
+    $soc->fetch($id);
 
-	if ($action == 'getSellerVATRates')
-	{
-		$seller = $mysoc;
-		$buyer = $soc;
-	}
-	else
-	{
-		$buyer = $mysoc;
-		$seller = $soc;
-	}
+    if ($action == 'getSellerVATRates')
+    {
+        $seller = $mysoc;
+        $buyer = $soc;
+    }
+    else
+    {
+        $buyer = $mysoc;
+        $seller = $soc;
+    }
 
-	$return=array();
+    $return=array();
 
-	$return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
-	$return['num']		= $form->num;
-	$return['error']	= $form->error;
+    $return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
+    $return['num']		= $form->num;
+    $return['error']	= $form->error;
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

Braces +11 added lines, -5 removed lines

@@ -20,9 +20,16 @@ 
  *       \brief      File to load vat rates combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -55,8 +62,7 @@ 
 	{
 		$seller = $mysoc;
 		$buyer = $soc;
-	}
-	else
+	} else
 	{
 		$buyer = $mysoc;
 		$seller = $soc;

Spacing +13 added lines, -13 removed lines

@@ -20,20 +20,20 @@ 
  *       \brief      File to load vat rates combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$htmlname	= GETPOST('htmlname','alpha');
-$selected	= (GETPOST('selected')?GETPOST('selected'):'-1');
-$productid	= (GETPOST('productid','int')?GETPOST('productid','int'):0);
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$htmlname	= GETPOST('htmlname', 'alpha');
+$selected	= (GETPOST('selected') ?GETPOST('selected') : '-1');
+$productid = (GETPOST('productid', 'int') ?GETPOST('productid', 'int') : 0);
 
 /*
  * View
@@ -44,7 +44,7 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($id) && ! empty($action) && ! empty($htmlname))
+if (!empty($id) && !empty($action) && !empty($htmlname))
 {
 	$form = new Form($db);
 	$soc = new Societe($db);
@@ -62,10 +62,10 @@ 
 		$seller = $soc;
 	}
 
-	$return=array();
+	$return = array();
 
-	$return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
-	$return['num']		= $form->num;
+	$return['value']	= $form->load_tva('tva_tx', $selected, $seller, $buyer, $productid, 0, '', true);
+	$return['num'] = $form->num;
 	$return['error']	= $form->error;
 
 	echo json_encode($return);

dolibarr/htdocs/core/ajax/contacts.php

Indentation +7 added lines, -7 removed lines

@@ -43,15 +43,15 @@
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
 {
-	$form = new Form($db);
+    $form = new Form($db);
 
-	$return=array();
-	if (empty($showempty)) $showempty=0;
+    $return=array();
+    if (empty($showempty)) $showempty=0;
 
-	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
-	$return['num']		= $form->num;
-	$return['error']	= $form->error;
+    $return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
+    $return['num']		= $form->num;
+    $return['error']	= $form->error;
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

Braces +13 added lines, -4 removed lines

@@ -21,9 +21,16 @@ 
  *       \brief      File to load contacts combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -49,7 +56,9 @@ 
 	$form = new Form($db);
 
 	$return=array();
-	if (empty($showempty)) $showempty=0;
+	if (empty($showempty)) {
+	    $showempty=0;
+	}
 
 	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
 	$return['num']		= $form->num;

Spacing +13 added lines, -13 removed lines

@@ -21,19 +21,19 @@ 
  *       \brief      File to load contacts combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$htmlname	= GETPOST('htmlname','alpha');
-$showempty	= GETPOST('showempty','int');
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$htmlname = GETPOST('htmlname', 'alpha');
+$showempty = GETPOST('showempty', 'int');
 
 /*
  * View
@@ -44,15 +44,15 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($id) && ! empty($action) && ! empty($htmlname))
+if (!empty($id) && !empty($action) && !empty($htmlname))
 {
 	$form = new Form($db);
 
-	$return=array();
-	if (empty($showempty)) $showempty=0;
+	$return = array();
+	if (empty($showempty)) $showempty = 0;
 
-	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
-	$return['num']		= $form->num;
+	$return['value']	= $form->selectcontacts($id, '', $htmlname, $showempty, '', '', 0, '', true);
+	$return['num'] = $form->num;
 	$return['error']	= $form->error;
 
 	echo json_encode($return);

dolibarr/htdocs/core/ajax/saveinplace.php

Indentation +164 added lines, -164 removed lines

@@ -58,175 +58,175 @@
 // Load original field value
 if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
 {
-	$ext_element		= GETPOST('ext_element','alpha',2);
-	$field				= substr($field, 8); // remove prefix val_
-	$type				= GETPOST('type','alpha',2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
-	$loadmethod			= GETPOST('loadmethod','alpha',2);
-	$savemethod			= GETPOST('savemethod','alpha',2);
-	$savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
-	$newelement			= $element;
-
-	$view='';
-	$format='text';
-	$return=array();
-	$error=0;
-
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
-	{
-		$element = $regs[1];
-		$subelement = $regs[2];
-	}
-
-	if ($element == 'propal') $newelement = 'propale';
-	else if ($element == 'fichinter') $newelement = 'ficheinter';
-	else if ($element == 'product') $newelement = 'produit';
-	else if ($element == 'member') $newelement = 'adherent';
-	else if ($element == 'order_supplier') {
-		$newelement = 'fournisseur';
-		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
-		$newelement = 'fournisseur';
-		$subelement = 'facture';
-	}
-	else $newelement = $element;
-
-	$_POST['action']='update';	// Hack so restrictarea will test permissions on write too
-	$feature = $newelement;
-	$feature2 = $subelement;
-	$object_id = $fk_element;
-	if ($feature == 'expedition' || $feature == 'shipping')
-	{
-		$feature = 'commande';
-		$object_id = 0;
-	}
-	if ($feature == 'shipping') $feature = 'commande';
-	if ($feature == 'payment') { $feature = 'facture'; }
-	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
-	//var_dump(GETPOST('action','aZ09'));
-	//var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
-	$check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
-	//var_dump($user->rights);
-	/*
+    $ext_element		= GETPOST('ext_element','alpha',2);
+    $field				= substr($field, 8); // remove prefix val_
+    $type				= GETPOST('type','alpha',2);
+    $value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
+    $loadmethod			= GETPOST('loadmethod','alpha',2);
+    $savemethod			= GETPOST('savemethod','alpha',2);
+    $savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
+    $newelement			= $element;
+
+    $view='';
+    $format='text';
+    $return=array();
+    $error=0;
+
+    if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+    {
+        $element = $regs[1];
+        $subelement = $regs[2];
+    }
+
+    if ($element == 'propal') $newelement = 'propale';
+    else if ($element == 'fichinter') $newelement = 'ficheinter';
+    else if ($element == 'product') $newelement = 'produit';
+    else if ($element == 'member') $newelement = 'adherent';
+    else if ($element == 'order_supplier') {
+        $newelement = 'fournisseur';
+        $subelement = 'commande';
+    }
+    else if ($element == 'invoice_supplier') {
+        $newelement = 'fournisseur';
+        $subelement = 'facture';
+    }
+    else $newelement = $element;
+
+    $_POST['action']='update';	// Hack so restrictarea will test permissions on write too
+    $feature = $newelement;
+    $feature2 = $subelement;
+    $object_id = $fk_element;
+    if ($feature == 'expedition' || $feature == 'shipping')
+    {
+        $feature = 'commande';
+        $object_id = 0;
+    }
+    if ($feature == 'shipping') $feature = 'commande';
+    if ($feature == 'payment') { $feature = 'facture'; }
+    if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
+    //var_dump(GETPOST('action','aZ09'));
+    //var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
+    $check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
+    //var_dump($user->rights);
+    /*
 	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->create) || ! empty($user->rights->$newelement->write)
 		|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
 		|| ($element == 'payment' && $user->rights->facture->paiement)
 		|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	*/
 
-	if ($check_access)
-	{
-		// Clean parameters
-		$newvalue = trim($value);
-
-		if ($type == 'numeric')
-		{
-			$newvalue = price2num($newvalue);
-
-			// Check parameters
-			if (! is_numeric($newvalue))
-			{
-				$error++;
-				$return['error'] = $langs->trans('ErrorBadValue');
-			}
-		}
-		else if ($type == 'datepicker')
-		{
-			$timestamp	= GETPOST('timestamp','int',2);
-			$format		= 'date';
-			$newvalue	= ($timestamp / 1000);
-		}
-		else if ($type == 'select')
-		{
-			$loadmethodname	= 'load_cache_'.$loadmethod;
-			$loadcachename	= 'cache_'.$loadmethod;
-			$loadviewname	= 'view_'.$loadmethod;
-
-			$form = new Form($db);
-			if (method_exists($form, $loadmethodname))
-			{
-				$ret = $form->$loadmethodname();
-				if ($ret > 0)
-				{
-					$loadcache = $form->$loadcachename;
-					$value = $loadcache[$newvalue];
-
-					if (! empty($form->$loadviewname))
-					{
-						$loadview = $form->$loadviewname;
-						$view = $loadview[$newvalue];
-					}
-				}
-				else
-				{
-					$error++;
-					$return['error'] = $form->error;
-				}
-			}
-			else
-			{
-				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
-				{
-					$module = $regs[1];
-					$subelement = $regs[2];
-				}
-
-				dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
-				$classname = 'Actions'.ucfirst($subelement);
-				$object = new $classname($db);
-				$ret = $object->$loadmethodname();
-				if ($ret > 0)
-				{
-					$loadcache = $object->$loadcachename;
-					$value = $loadcache[$newvalue];
-
-					if (! empty($object->$loadviewname))
-					{
-						$loadview = $object->$loadviewname;
-						$view = $loadview[$newvalue];
-					}
-				}
-				else
-				{
-					$error++;
-					$return['error'] = $object->error;
-				}
-			}
-		}
-
-		if (! $error)
-		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
-
-			// Specific for add_object_linked()
-			// TODO add a function for variable treatment
-			$object->ext_fk_element = $newvalue;
-			$object->ext_element = $ext_element;
-			$object->fk_element = $fk_element;
-			$object->element = $element;
-
-			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
-			if ($ret > 0)
-			{
-				if ($type == 'numeric') $value = price($newvalue);
-				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
-
-				$return['value'] = $value;
-				$return['view'] = (! empty($view) ? $view : $value);
-			}
-			else
-			{
-				$return['error'] = $object->error;
-			}
-		}
-
-		echo json_encode($return);
-	}
-	else
-	{
-		echo $langs->trans('NotEnoughPermissions');
-	}
+    if ($check_access)
+    {
+        // Clean parameters
+        $newvalue = trim($value);
+
+        if ($type == 'numeric')
+        {
+            $newvalue = price2num($newvalue);
+
+            // Check parameters
+            if (! is_numeric($newvalue))
+            {
+                $error++;
+                $return['error'] = $langs->trans('ErrorBadValue');
+            }
+        }
+        else if ($type == 'datepicker')
+        {
+            $timestamp	= GETPOST('timestamp','int',2);
+            $format		= 'date';
+            $newvalue	= ($timestamp / 1000);
+        }
+        else if ($type == 'select')
+        {
+            $loadmethodname	= 'load_cache_'.$loadmethod;
+            $loadcachename	= 'cache_'.$loadmethod;
+            $loadviewname	= 'view_'.$loadmethod;
+
+            $form = new Form($db);
+            if (method_exists($form, $loadmethodname))
+            {
+                $ret = $form->$loadmethodname();
+                if ($ret > 0)
+                {
+                    $loadcache = $form->$loadcachename;
+                    $value = $loadcache[$newvalue];
+
+                    if (! empty($form->$loadviewname))
+                    {
+                        $loadview = $form->$loadviewname;
+                        $view = $loadview[$newvalue];
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $return['error'] = $form->error;
+                }
+            }
+            else
+            {
+                $module = $subelement = $ext_element;
+                if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+                {
+                    $module = $regs[1];
+                    $subelement = $regs[2];
+                }
+
+                dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
+                $classname = 'Actions'.ucfirst($subelement);
+                $object = new $classname($db);
+                $ret = $object->$loadmethodname();
+                if ($ret > 0)
+                {
+                    $loadcache = $object->$loadcachename;
+                    $value = $loadcache[$newvalue];
+
+                    if (! empty($object->$loadviewname))
+                    {
+                        $loadview = $object->$loadviewname;
+                        $view = $loadview[$newvalue];
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $return['error'] = $object->error;
+                }
+            }
+        }
+
+        if (! $error)
+        {
+            if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+
+            // Specific for add_object_linked()
+            // TODO add a function for variable treatment
+            $object->ext_fk_element = $newvalue;
+            $object->ext_element = $ext_element;
+            $object->fk_element = $fk_element;
+            $object->element = $element;
+
+            $ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
+            if ($ret > 0)
+            {
+                if ($type == 'numeric') $value = price($newvalue);
+                else if ($type == 'textarea') $value = dol_nl2br($newvalue);
+
+                $return['value'] = $value;
+                $return['view'] = (! empty($view) ? $view : $value);
+            }
+            else
+            {
+                $return['error'] = $object->error;
+            }
+        }
+
+        echo json_encode($return);
+    }
+    else
+    {
+        echo $langs->trans('NotEnoughPermissions');
+    }
 }
 

Braces +43 added lines, -30 removed lines

@@ -20,10 +20,19 @@ 
  *       \brief      File to save field value
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -81,19 +90,23 @@ 
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $newelement = 'propale';
-	else if ($element == 'fichinter') $newelement = 'ficheinter';
-	else if ($element == 'product') $newelement = 'produit';
-	else if ($element == 'member') $newelement = 'adherent';
-	else if ($element == 'order_supplier') {
+	if ($element == 'propal') {
+	    $newelement = 'propale';
+	} else if ($element == 'fichinter') {
+	    $newelement = 'ficheinter';
+	} else if ($element == 'product') {
+	    $newelement = 'produit';
+	} else if ($element == 'member') {
+	    $newelement = 'adherent';
+	} else if ($element == 'order_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
+	} else if ($element == 'invoice_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'facture';
+	} else {
+	    $newelement = $element;
 	}
-	else $newelement = $element;
 
 	$_POST['action']='update';	// Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
@@ -104,7 +117,9 @@ 
 		$feature = 'commande';
 		$object_id = 0;
 	}
-	if ($feature == 'shipping') $feature = 'commande';
+	if ($feature == 'shipping') {
+	    $feature = 'commande';
+	}
 	if ($feature == 'payment') { $feature = 'facture'; }
 	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
 	//var_dump(GETPOST('action','aZ09'));
@@ -133,14 +148,12 @@ 
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
-		}
-		else if ($type == 'datepicker')
+		} else if ($type == 'datepicker')
 		{
 			$timestamp	= GETPOST('timestamp','int',2);
 			$format		= 'date';
 			$newvalue	= ($timestamp / 1000);
-		}
-		else if ($type == 'select')
+		} else if ($type == 'select')
 		{
 			$loadmethodname	= 'load_cache_'.$loadmethod;
 			$loadcachename	= 'cache_'.$loadmethod;
@@ -160,14 +173,12 @@ 
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$return['error'] = $form->error;
 				}
-			}
-			else
+			} else
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
@@ -190,8 +201,7 @@ 
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$return['error'] = $object->error;
@@ -201,7 +211,9 @@ 
 
 		if (! $error)
 		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+			if ((isset($object) && ! is_object($object)) || empty($savemethod)) {
+			    $object = new GenericObject($db);
+			}
 
 			// Specific for add_object_linked()
 			// TODO add a function for variable treatment
@@ -213,21 +225,22 @@ 
 			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
 			if ($ret > 0)
 			{
-				if ($type == 'numeric') $value = price($newvalue);
-				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
+				if ($type == 'numeric') {
+				    $value = price($newvalue);
+				} else if ($type == 'textarea') {
+				    $value = dol_nl2br($newvalue);
+				}
 
 				$return['value'] = $value;
 				$return['view'] = (! empty($view) ? $view : $value);
-			}
-			else
+			} else
 			{
 				$return['error'] = $object->error;
 			}
 		}
 
 		echo json_encode($return);
-	}
-	else
+	} else
 	{
 		echo $langs->trans('NotEnoughPermissions');
 	}

Spacing +36 added lines, -36 removed lines

@@ -20,21 +20,21 @@ 
  *       \brief      File to save field value
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
-$field			= GETPOST('field','alpha',2);
-$element		= GETPOST('element','alpha',2);
-$table_element	= GETPOST('table_element','alpha',2);
-$fk_element		= GETPOST('fk_element','alpha',2);
+$field = GETPOST('field', 'alpha', 2);
+$element = GETPOST('element', 'alpha', 2);
+$table_element = GETPOST('table_element', 'alpha', 2);
+$fk_element = GETPOST('fk_element', 'alpha', 2);
 
 /* Example:
 field:editval_ref_customer (8 first chars will removed to know name of property)
@@ -59,23 +59,23 @@ 
 //print_r($_POST);
 
 // Load original field value
-if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
+if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
-	$ext_element		= GETPOST('ext_element','alpha',2);
+	$ext_element = GETPOST('ext_element', 'alpha', 2);
 	$field				= substr($field, 8); // remove prefix val_
-	$type				= GETPOST('type','alpha',2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
-	$loadmethod			= GETPOST('loadmethod','alpha',2);
-	$savemethod			= GETPOST('savemethod','alpha',2);
-	$savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
+	$type = GETPOST('type', 'alpha', 2);
+	$value				= ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
+	$loadmethod			= GETPOST('loadmethod', 'alpha', 2);
+	$savemethod			= GETPOST('savemethod', 'alpha', 2);
+	$savemethodname = (!empty($savemethod) ? $savemethod : 'setValueFrom');
 	$newelement			= $element;
 
-	$view='';
-	$format='text';
-	$return=array();
-	$error=0;
+	$view = '';
+	$format = 'text';
+	$return = array();
+	$error = 0;
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
 	{
 		$element = $regs[1];
 		$subelement = $regs[2];
@@ -95,7 +95,7 @@ 
 	}
 	else $newelement = $element;
 
-	$_POST['action']='update';	// Hack so restrictarea will test permissions on write too
+	$_POST['action'] = 'update'; // Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
 	$feature2 = $subelement;
 	$object_id = $fk_element;
@@ -128,7 +128,7 @@ 
 			$newvalue = price2num($newvalue);
 
 			// Check parameters
-			if (! is_numeric($newvalue))
+			if (!is_numeric($newvalue))
 			{
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
@@ -136,15 +136,15 @@ 
 		}
 		else if ($type == 'datepicker')
 		{
-			$timestamp	= GETPOST('timestamp','int',2);
-			$format		= 'date';
-			$newvalue	= ($timestamp / 1000);
+			$timestamp = GETPOST('timestamp', 'int', 2);
+			$format = 'date';
+			$newvalue = ($timestamp / 1000);
 		}
 		else if ($type == 'select')
 		{
-			$loadmethodname	= 'load_cache_'.$loadmethod;
-			$loadcachename	= 'cache_'.$loadmethod;
-			$loadviewname	= 'view_'.$loadmethod;
+			$loadmethodname = 'load_cache_'.$loadmethod;
+			$loadcachename = 'cache_'.$loadmethod;
+			$loadviewname = 'view_'.$loadmethod;
 
 			$form = new Form($db);
 			if (method_exists($form, $loadmethodname))
@@ -155,7 +155,7 @@ 
 					$loadcache = $form->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (! empty($form->$loadviewname))
+					if (!empty($form->$loadviewname))
 					{
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
@@ -170,7 +170,7 @@ 
 			else
 			{
 				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
 					$module = $regs[1];
 					$subelement = $regs[2];
@@ -185,7 +185,7 @@ 
 					$loadcache = $object->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (! empty($object->$loadviewname))
+					if (!empty($object->$loadviewname))
 					{
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
@@ -199,9 +199,9 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+			if ((isset($object) && !is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
 
 			// Specific for add_object_linked()
 			// TODO add a function for variable treatment
@@ -210,14 +210,14 @@ 
 			$object->fk_element = $fk_element;
 			$object->element = $element;
 
-			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
+			$ret = $object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
 			if ($ret > 0)
 			{
 				if ($type == 'numeric') $value = price($newvalue);
 				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
 
 				$return['value'] = $value;
-				$return['view'] = (! empty($view) ? $view : $value);
+				$return['view'] = (!empty($view) ? $view : $value);
 			}
 			else
 			{

dolibarr/htdocs/core/ajax/extraparams.php

Indentation +22 added lines, -22 removed lines

@@ -43,35 +43,35 @@
 
 if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
 {
-	$value = GETPOST('value','alpha');
-	$params=array();
+    $value = GETPOST('value','alpha');
+    $params=array();
 
-	dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
+    dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
 
-	$classpath = $subelement = $element;
+    $classpath = $subelement = $element;
 
-	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+    // For compatibility
+    if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
+    else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
+    else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
+    else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
+    else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
+    else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
+    else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
+    else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
-	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
+    dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+    if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
+    else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
+    else $classname = ucfirst($subelement);
 
-	$object	= new $classname($db);
-	$object->fetch($id);
+    $object	= new $classname($db);
+    $object->fetch($id);
 
-	$params[$htmlelement] = array($type => $value);
-	$object->extraparams = array_merge($object->extraparams, $params);
+    $params[$htmlelement] = array($type => $value);
+    $object->extraparams = array_merge($object->extraparams, $params);
 
-	$result=$object->setExtraParameters();
+    $result=$object->setExtraParameters();
 }
 

Spacing +23 added lines, -23 removed lines

@@ -20,17 +20,17 @@ 
  *	\brief      File to return Ajax response on set extra parameters of elements
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 include '../../main.inc.php';
 
-$id = GETPOST('id','int');
-$element = GETPOST('element','alpha');
-$htmlelement = GETPOST('htmlelement','alpha');
+$id = GETPOST('id', 'int');
+$element = GETPOST('element', 'alpha');
+$htmlelement = GETPOST('htmlelement', 'alpha');
 $type = GETPOST('type', 'alpha');
 
 /*
@@ -41,37 +41,37 @@ 
 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
+if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type))
 {
-	$value = GETPOST('value','alpha');
-	$params=array();
+	$value = GETPOST('value', 'alpha');
+	$params = array();
 
 	dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
 
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; }
+	else if ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; }
+	else if ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; }
+	else if ($element == 'contract') { $classpath = $subelement = 'contrat'; }
+	else if ($element == 'shipping') { $classpath = $subelement = 'expedition'; }
+	else if ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
+	else if ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
+	else if ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
+	if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; }
+	else if ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; }
 	else $classname = ucfirst($subelement);
 
-	$object	= new $classname($db);
+	$object = new $classname($db);
 	$object->fetch($id);
 
 	$params[$htmlelement] = array($type => $value);
 	$object->extraparams = array_merge($object->extraparams, $params);
 
-	$result=$object->setExtraParameters();
+	$result = $object->setExtraParameters();
 }
 

Braces +20 added lines, -16 removed lines

@@ -20,11 +20,22 @@ 
  *	\brief      File to return Ajax response on set extra parameters of elements
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 include '../../main.inc.php';
 
@@ -51,20 +62,13 @@ 
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; } else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; } else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; } else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; } else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; } else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; } else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; } else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; } else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; } else {
+	    $classname = ucfirst($subelement);
+	}
 
 	$object	= new $classname($db);
 	$object->fetch($id);

dolibarr/htdocs/core/ajax/box.php

Indentation +16 added lines, -16 removed lines

@@ -53,28 +53,28 @@
 // Add a box
 if ($boxid > 0 && $zone !='' && $userid > 0)
 {
-	$tmp=explode('-',$boxorder);
-	$nbboxonleft=substr_count($tmp[0],',');
-	$nbboxonright=substr_count($tmp[1],',');
-	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
+    $tmp=explode('-',$boxorder);
+    $nbboxonleft=substr_count($tmp[0],',');
+    $nbboxonright=substr_count($tmp[1],',');
+    print $nbboxonleft.'-'.$nbboxonright;
+    if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
     else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
 if ($boxorder && $zone != '' &&  $userid > 0)
 {
-	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
-	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
+    // boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
+    dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
-	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
-	if ($result > 0)
-	{
-	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
-	    {
-	       setEventMessages($langs->trans("BoxAdded"), null);
-	    }
-	}
+    $result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+    if ($result > 0)
+    {
+        $langs->load("boxes");
+        if (! GETPOST('closing'))
+        {
+            setEventMessages($langs->trans("BoxAdded"), null);
+        }
+    }
 }
 

Braces +24 added lines, -7 removed lines

@@ -21,11 +21,22 @@ 
  *       \brief      File to return Ajax response on Box move or close
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -60,8 +71,14 @@ 
 	$nbboxonleft=substr_count($tmp[0],',');
 	$nbboxonright=substr_count($tmp[1],',');
 	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
-    else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
+	if ($nbboxonleft > $nbboxonright) {
+	    $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);
+	}
+	// Insert id of new box into list
+    else {
+        $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);
+    }
+    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move

Spacing +20 added lines, -20 removed lines

@@ -21,23 +21,23 @@ 
  *       \brief      File to return Ajax response on Box move or close
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
-$boxid=GETPOST('boxid','int');
-$boxorder=GETPOST('boxorder');
-$userid=GETPOST('userid');
-$zone=GETPOST('zone','int');
-$userid=GETPOST('userid','int');
+$boxid = GETPOST('boxid', 'int');
+$boxorder = GETPOST('boxorder');
+$userid = GETPOST('userid');
+$zone = GETPOST('zone', 'int');
+$userid = GETPOST('userid', 'int');
 
 
 /*
@@ -54,27 +54,27 @@ 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Add a box
-if ($boxid > 0 && $zone !='' && $userid > 0)
+if ($boxid > 0 && $zone != '' && $userid > 0)
 {
-	$tmp=explode('-',$boxorder);
-	$nbboxonleft=substr_count($tmp[0],',');
-	$nbboxonright=substr_count($tmp[1],',');
+	$tmp = explode('-', $boxorder);
+	$nbboxonleft = substr_count($tmp[0], ',');
+	$nbboxonright = substr_count($tmp[1], ',');
 	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
-    else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
+	if ($nbboxonleft > $nbboxonright) $boxorder = preg_replace('/B:/', 'B:'.$boxid.',', $boxorder); // Insert id of new box into list
+    else $boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
-if ($boxorder && $zone != '' &&  $userid > 0)
+if ($boxorder && $zone != '' && $userid > 0)
 {
 	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
 	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
-	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
 	if ($result > 0)
 	{
 	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
+	    if (!GETPOST('closing'))
 	    {
 	       setEventMessages($langs->trans("BoxAdded"), null);
 	    }

dolibarr/htdocs/core/actions_printing.inc.php

Spacing +10 added lines, -10 removed lines

@@ -30,12 +30,12 @@ 
 // Print file
 if ($action == 'print_file' && $user->rights->printing->read) {
     $langs->load("printing");
-    require_once DOL_DOCUMENT_ROOT . '/core/modules/printing/modules_printing.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
     $objectprint = new PrintingDriver($db);
     $list = $objectprint->listDrivers($db, 10);
-    if (! empty($list)) {
-        $errorprint=0;
-        $printerfound=0;
+    if (!empty($list)) {
+        $errorprint = 0;
+        $printerfound = 0;
         foreach ($list as $driver) {
             require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
             $langs->load($driver);
@@ -43,13 +43,13 @@ 
             $printer = new $classname($db);
             //print '<pre>'.print_r($printer, true).'</pre>';
 
-            if (! empty($conf->global->{$printer->active}))
+            if (!empty($conf->global->{$printer->active}))
             {
                 $printerfound++;
 
-                $subdir='';
+                $subdir = '';
                 $module = GETPOST('printer', 'alpha');
-                switch ($module )
+                switch ($module)
                 {
                     case 'livraison' :
                         $subdir = 'receipt';
@@ -69,21 +69,21 @@ 
                         //print '<pre>'.print_r($printer->errors, true).'</pre>';
                         setEventMessages($printer->error, $printer->errors, 'errors');
                     }
-                    if ($ret==0)
+                    if ($ret == 0)
                     {
                         //print '<pre>'.print_r($printer->errors, true).'</pre>';
                         setEventMessages($printer->error, $printer->errors);
                         setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
                     }
                 }
-                catch(Exception $e)
+                catch (Exception $e)
                 {
                     $ret = 1;
                     setEventMessages($e->getMessage(), null, 'errors');
                 }
             }
         }
-        if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+        if ($printerfound == 0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
     } else {
         setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
     }

Braces +4 added lines, -3 removed lines

@@ -75,15 +75,16 @@
                         setEventMessages($printer->error, $printer->errors);
                         setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
                     }
-                }
-                catch(Exception $e)
+                } catch(Exception $e)
                 {
                     $ret = 1;
                     setEventMessages($e->getMessage(), null, 'errors');
                 }
             }
         }
-        if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+        if ($printerfound==0) {
+            setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+        }
     } else {
         setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
     }

dolibarr/htdocs/core/antispamimage.php

Spacing +13 added lines, -13 removed lines

@@ -21,14 +21,14 @@ 
  *		\brief      Return antispam image
  */
 
-define('NOLOGIN',1);
+define('NOLOGIN', 1);
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER',1);
-if (! defined('NOREQUIREDB'))     define('NOREQUIREDB',1);
-if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', 1);
+if (!defined('NOREQUIREDB'))     define('NOREQUIREDB', 1);
+if (!defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', 1);
+if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 
 require_once '../main.inc.php';
 
@@ -37,24 +37,24 @@ 
  * View
  */
 
-$length=5;
+$length = 5;
 $letters = 'aAbBCDeEFgGhHJKLmMnNpPqQRsStTuVwWXYZz2345679';
 $number = strlen($letters);
 $string = '';
-for($i = 0; $i < $length; $i++)
+for ($i = 0; $i < $length; $i++)
 {
     $string .= $letters{mt_rand(0, $number - 1)};
 }
 //print $string;
 
 
-$sessionkey='dol_antispam_value';
-$_SESSION[$sessionkey]=$string;
+$sessionkey = 'dol_antispam_value';
+$_SESSION[$sessionkey] = $string;
 
-$img = imagecreate(80,32);
+$img = imagecreate(80, 32);
 if (empty($img))
 {
-    dol_print_error('',"Problem with GD creation");
+    dol_print_error('', "Problem with GD creation");
     exit;
 }
 

Braces +18 added lines, -6 removed lines

@@ -23,12 +23,24 @@
 
 define('NOLOGIN',1);
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER',1);
-if (! defined('NOREQUIREDB'))     define('NOREQUIREDB',1);
-if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOREQUIREUSER')) {
+    define('NOREQUIREUSER',1);
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB',1);
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN',1);
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 
 require_once '../main.inc.php';
 

dolibarr/htdocs/core/extrafieldsinexport.inc.php

Indentation +50 added lines, -50 removed lines

@@ -13,55 +13,55 @@
 $resql=$this->db->query($sql);
 if ($resql)    // This can fail when class is used on old database (during migration for example)
 {
-	while ($obj=$this->db->fetch_object($resql))
-	{
-		$fieldname=$keyforaliasextra.'.'.$obj->name;
-		$fieldlabel=ucfirst($obj->label);
-		$typeFilter="Text";
-		$typefield=preg_replace('/\(.*$/', '', $obj->type);	// double(24,8) -> double
-		switch ($typefield) {
-			case 'int':
-			case 'integer':
-			case 'double':
-			case 'price':
-				$typeFilter="Numeric";
-				break;
-			case 'date':
-			case 'datetime':
-			case 'timestamp':
-				$typeFilter="Date";
-				break;
-			case 'boolean':
-				$typeFilter="Boolean";
-				break;
-			case 'sellist':
-				$tmp='';
-				$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-				if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-					$tmpkeys=array_keys($tmpparam['options']);
-					$tmp=array_shift($tmpkeys);
-				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
-				break;
-		}
-		if ($obj->type!='separate')
-		{
-		    // If not a computed field
-		    if (empty($obj->fieldcomputed))
-		    {
-    			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-    			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-    			$this->export_entities_array[$r][$fieldname]=$keyforelement;
-		    }
-			// If this is a computed field
-			else
-			{
-			    $this->export_fields_array[$r][$fieldname]=$fieldlabel;
-			    $this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
-			    $this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
-			    $this->export_entities_array[$r][$fieldname]=$keyforelement;
-			}
-		}
-	}
+    while ($obj=$this->db->fetch_object($resql))
+    {
+        $fieldname=$keyforaliasextra.'.'.$obj->name;
+        $fieldlabel=ucfirst($obj->label);
+        $typeFilter="Text";
+        $typefield=preg_replace('/\(.*$/', '', $obj->type);	// double(24,8) -> double
+        switch ($typefield) {
+            case 'int':
+            case 'integer':
+            case 'double':
+            case 'price':
+                $typeFilter="Numeric";
+                break;
+            case 'date':
+            case 'datetime':
+            case 'timestamp':
+                $typeFilter="Date";
+                break;
+            case 'boolean':
+                $typeFilter="Boolean";
+                break;
+            case 'sellist':
+                $tmp='';
+                $tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+                if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+                    $tmpkeys=array_keys($tmpparam['options']);
+                    $tmp=array_shift($tmpkeys);
+                }
+                if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+                break;
+        }
+        if ($obj->type!='separate')
+        {
+            // If not a computed field
+            if (empty($obj->fieldcomputed))
+            {
+                $this->export_fields_array[$r][$fieldname]=$fieldlabel;
+                $this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+                $this->export_entities_array[$r][$fieldname]=$keyforelement;
+            }
+            // If this is a computed field
+            else
+            {
+                $this->export_fields_array[$r][$fieldname]=$fieldlabel;
+                $this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
+                $this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
+                $this->export_entities_array[$r][$fieldname]=$keyforelement;
+            }
+        }
+    }
 }
 // End add axtra fields

Spacing +23 added lines, -23 removed lines

@@ -8,58 +8,58 @@
 }
 
 // Add extra fields
-$sql="SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
+$sql = "SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
 //print $sql;
-$resql=$this->db->query($sql);
+$resql = $this->db->query($sql);
 if ($resql)    // This can fail when class is used on old database (during migration for example)
 {
-	while ($obj=$this->db->fetch_object($resql))
+	while ($obj = $this->db->fetch_object($resql))
 	{
-		$fieldname=$keyforaliasextra.'.'.$obj->name;
-		$fieldlabel=ucfirst($obj->label);
-		$typeFilter="Text";
-		$typefield=preg_replace('/\(.*$/', '', $obj->type);	// double(24,8) -> double
+		$fieldname = $keyforaliasextra.'.'.$obj->name;
+		$fieldlabel = ucfirst($obj->label);
+		$typeFilter = "Text";
+		$typefield = preg_replace('/\(.*$/', '', $obj->type); // double(24,8) -> double
 		switch ($typefield) {
 			case 'int':
 			case 'integer':
 			case 'double':
 			case 'price':
-				$typeFilter="Numeric";
+				$typeFilter = "Numeric";
 				break;
 			case 'date':
 			case 'datetime':
 			case 'timestamp':
-				$typeFilter="Date";
+				$typeFilter = "Date";
 				break;
 			case 'boolean':
-				$typeFilter="Boolean";
+				$typeFilter = "Boolean";
 				break;
 			case 'sellist':
-				$tmp='';
-				$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+				$tmp = '';
+				$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
 				if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-					$tmpkeys=array_keys($tmpparam['options']);
-					$tmp=array_shift($tmpkeys);
+					$tmpkeys = array_keys($tmpparam['options']);
+					$tmp = array_shift($tmpkeys);
 				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
 				break;
 		}
-		if ($obj->type!='separate')
+		if ($obj->type != 'separate')
 		{
 		    // If not a computed field
 		    if (empty($obj->fieldcomputed))
 		    {
-    			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-    			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-    			$this->export_entities_array[$r][$fieldname]=$keyforelement;
+    			$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+    			$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+    			$this->export_entities_array[$r][$fieldname] = $keyforelement;
 		    }
 			// If this is a computed field
 			else
 			{
-			    $this->export_fields_array[$r][$fieldname]=$fieldlabel;
-			    $this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
-			    $this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
-			    $this->export_entities_array[$r][$fieldname]=$keyforelement;
+			    $this->export_fields_array[$r][$fieldname] = $fieldlabel;
+			    $this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
+			    $this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
+			    $this->export_entities_array[$r][$fieldname] = $keyforelement;
 			}
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -11,11 +11,13 @@ 
 $sql="SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
 //print $sql;
 $resql=$this->db->query($sql);
-if ($resql)    // This can fail when class is used on old database (during migration for example)
+if ($resql) {
+    // This can fail when class is used on old database (during migration for example)
 {
 	while ($obj=$this->db->fetch_object($resql))
 	{
 		$fieldname=$keyforaliasextra.'.'.$obj->name;
+}
 		$fieldlabel=ucfirst($obj->label);
 		$typeFilter="Text";
 		$typefield=preg_replace('/\(.*$/', '', $obj->type);	// double(24,8) -> double
@@ -41,7 +43,9 @@ 
 					$tmpkeys=array_keys($tmpparam['options']);
 					$tmp=array_shift($tmpkeys);
 				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+				    $typeFilter="List:".$tmp;
+				}
 				break;
 		}
 		if ($obj->type!='separate')

dolibarr/htdocs/core/actions_massactions.inc.php

Indentation +1097 added lines, -1097 removed lines

@@ -36,8 +36,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;
 }
 
 
@@ -45,1029 +45,1029 @@ 
 $maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if (! empty($massaction) && 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';
-
-	$listofobjectid=array();
-	$listofobjectthirdparties=array();
-	$listofobjectref=array();
-
-	if (! $error)
-	{
-		$thirdparty=new Societe($db);
-		if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
-		if ($objecttmp->element == 'holiday')       $thirdparty=new User($db);
-
-		$objecttmp=new $objectclass($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;
-				$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;
-				$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';
-	}
-
-	$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';
-	}
-
-	// 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();
-
-			// 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);
-
-			//var_dump($listofobjectref);exit;
-			$attachedfiles=array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
-			$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' && $objectoj->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;
-					}
-					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 ($_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';
-					$filedir=$uploaddir . '/' . dol_sanitizeFileName($objectobj->ref);
-					$file = $filedir . '/' . $filename;
-					$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;
-					}
-				}
-
-				// Object of thirdparty qualified
-				$listofqualifiedobj[$objectid]=$objectobj;
-				$listofqualifiedref[$objectid]=$objectobj->ref;
-
-
-				//var_dump($listofqualifiedref);
-			}
-
-			// Send email if there is at least one qualified record
-			if (count($listofqualifiedobj) > 0)
-			{
-				$langs->load("commercial");
-
-				$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'] .'>';
-				}
-
-				$replyto = $from;
-				$subject = GETPOST('subject','none');
-				$message = GETPOST('message','none');
-
-				$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));
-
-				// $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)
-				$oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
-				$looparray=array();
-				if (! $oneemailperrecipient)
-				{
-					$looparray = $listofqualifiedobj;
-					foreach ($looparray as $key => $objecttmp)
-					{
-						$looparray[$key]->thirdparty = $thirdparty;
-					}
-				}
-				else
-				{
-					$objectforloop=new $objectclass($db);
-					$objectforloop->thirdparty = $thirdparty;
-					$looparray[0]=$objectforloop;
-				}
-				//var_dump($looparray);exit;
-
-				foreach ($looparray as $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per record
-				{
-					// 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');
-
-					if ( ! empty( $listofobjectthirdparties ) ) {
-						$parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
-					}
-					if ( ! empty( $listofobjectref ) ) {
-						$parameters['listofobjectref'] = $listofobjectref;
-					}
-
-					complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
-
-					$subject=make_substitutions($subject, $substitutionarray);
-					$message=make_substitutions($message, $substitutionarray);
-
-					$filepath = $attachedfiles['paths'];
-					$filename = $attachedfiles['names'];
-					$mimetype = $attachedfiles['mimes'];
-
-					// 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';
-
-						$trackid.=$objecttmp->id;
-					}
-					//var_dump($filepath);
-					//var_dump($trackid);exit;
-
-					// Send mail (substitutionarray must be done just before this)
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($subject,$sendto,$from,$message,$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 "
-
-							$error=0;
-
-							// Insert logs into agenda
-							foreach($listofqualifiedobj as $objid => $objectobj)
-							{
-								/*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
+    $resaction = '';
+    $nbsent = 0;
+    $nbignored = 0;
+    $langs->load("mails");
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    $listofobjectid=array();
+    $listofobjectthirdparties=array();
+    $listofobjectref=array();
+
+    if (! $error)
+    {
+        $thirdparty=new Societe($db);
+        if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
+        if ($objecttmp->element == 'holiday')       $thirdparty=new User($db);
+
+        $objecttmp=new $objectclass($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;
+                $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;
+                $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';
+    }
+
+    $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';
+    }
+
+    // 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();
+
+            // 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);
+
+            //var_dump($listofobjectref);exit;
+            $attachedfiles=array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
+            $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' && $objectoj->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;
+                    }
+                    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 ($_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';
+                    $filedir=$uploaddir . '/' . dol_sanitizeFileName($objectobj->ref);
+                    $file = $filedir . '/' . $filename;
+                    $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;
+                    }
+                }
+
+                // Object of thirdparty qualified
+                $listofqualifiedobj[$objectid]=$objectobj;
+                $listofqualifiedref[$objectid]=$objectobj->ref;
+
+
+                //var_dump($listofqualifiedref);
+            }
+
+            // Send email if there is at least one qualified record
+            if (count($listofqualifiedobj) > 0)
+            {
+                $langs->load("commercial");
+
+                $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'] .'>';
+                }
+
+                $replyto = $from;
+                $subject = GETPOST('subject','none');
+                $message = GETPOST('message','none');
+
+                $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));
+
+                // $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)
+                $oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
+                $looparray=array();
+                if (! $oneemailperrecipient)
+                {
+                    $looparray = $listofqualifiedobj;
+                    foreach ($looparray as $key => $objecttmp)
+                    {
+                        $looparray[$key]->thirdparty = $thirdparty;
+                    }
+                }
+                else
+                {
+                    $objectforloop=new $objectclass($db);
+                    $objectforloop->thirdparty = $thirdparty;
+                    $looparray[0]=$objectforloop;
+                }
+                //var_dump($looparray);exit;
+
+                foreach ($looparray as $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per record
+                {
+                    // 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');
+
+                    if ( ! empty( $listofobjectthirdparties ) ) {
+                        $parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
+                    }
+                    if ( ! empty( $listofobjectref ) ) {
+                        $parameters['listofobjectref'] = $listofobjectref;
+                    }
+
+                    complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
+
+                    $subject=make_substitutions($subject, $substitutionarray);
+                    $message=make_substitutions($message, $substitutionarray);
+
+                    $filepath = $attachedfiles['paths'];
+                    $filename = $attachedfiles['names'];
+                    $mimetype = $attachedfiles['mimes'];
+
+                    // 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';
+
+                        $trackid.=$objecttmp->id;
+                    }
+                    //var_dump($filepath);
+                    //var_dump($trackid);exit;
+
+                    // Send mail (substitutionarray must be done just before this)
+                    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                    $mailfile = new CMailFile($subject,$sendto,$from,$message,$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 "
+
+                            $error=0;
+
+                            // Insert logs into agenda
+                            foreach($listofqualifiedobj as $objid => $objectobj)
+                            {
+                                /*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 = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
-									$actionmsg = dol_concatdesc($actionmsg, $message);
-								}
-								$actionmsg2='';
-
-								// Initialisation donnees
-								$objectobj->sendtoid		= 0;
-								$objectobj->actionmsg		= $actionmsg;  // Long text
-								$objectobj->actionmsg2		= $actionmsg2; // Short text
-								$objectobj->fk_element		= $objid;
-								$objectobj->elementtype	= $objectobj->element;
-
-								$triggername = strtoupper(get_class($objectobj)) .'_SENTBYMAIL';
-								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
-								if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
-								if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
-								if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYMAIL';
-								if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
-								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
-								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
-								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
-
-								if (! empty($triggername))
-								{
-									// Appel des triggers
-									include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-									$interface=new Interfaces($db);
-									$result=$interface->run_triggers($triggername, $objectobj, $user, $langs, $conf);
-									if ($result < 0) { $error++; $errors=$interface->errors; }
-									// Fin appel triggers
-
-									if ($error)
-									{
-										setEventMessages($db->lasterror(), $errors, 'errors');
-										dol_syslog("Error in trigger ".$triggername.' '.$db->lasterror(), LOG_ERR);
-									}
-								}
-
-								$nbsent++;
-							}
-						}
-						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>";
-
-		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='';
-	}
+                                $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') . ": " . $subject);
+                                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+                                    $actionmsg = dol_concatdesc($actionmsg, $message);
+                                }
+                                $actionmsg2='';
+
+                                // Initialisation donnees
+                                $objectobj->sendtoid		= 0;
+                                $objectobj->actionmsg		= $actionmsg;  // Long text
+                                $objectobj->actionmsg2		= $actionmsg2; // Short text
+                                $objectobj->fk_element		= $objid;
+                                $objectobj->elementtype	= $objectobj->element;
+
+                                $triggername = strtoupper(get_class($objectobj)) .'_SENTBYMAIL';
+                                if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
+                                if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
+                                if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
+                                if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYMAIL';
+                                if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
+                                if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+                                if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
+                                if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
+
+                                if (! empty($triggername))
+                                {
+                                    // Appel des triggers
+                                    include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
+                                    $interface=new Interfaces($db);
+                                    $result=$interface->run_triggers($triggername, $objectobj, $user, $langs, $conf);
+                                    if ($result < 0) { $error++; $errors=$interface->errors; }
+                                    // Fin appel triggers
+
+                                    if ($error)
+                                    {
+                                        setEventMessages($db->lasterror(), $errors, 'errors');
+                                        dol_syslog("Error in trigger ".$triggername.' '.$db->lasterror(), LOG_ERR);
+                                    }
+                                }
+
+                                $nbsent++;
+                            }
+                        }
+                        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>";
+
+        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='';
+    }
 }
 
 if ($massaction == 'confirm_createbills')
 {
-	$orders = GETPOST('toselect','array');
-	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-	$validate_invoices = GETPOST('valdate_invoices', 'int');
-
-	$TFact = array();
-	$TFactThird = array();
-
-	$nb_bills_created = 0;
-
-	$db->begin();
-
-	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 {
-
-			$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;
-
-			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-			if (empty($datefacture))
-			{
-				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-			}
-
-			$objecttmp->date = $datefacture;
-			$objecttmp->origin    = 'commande';
-			$objecttmp->origin_id = $id_order;
-
-			$res = $objecttmp->create($user);
-
-			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 (! $db->query($sql))
-			{
-				$error++;
-			}
-
-			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);
-
-				for ($i=0;$i<$num;$i++)
-				{
-					$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
-					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;
-						}
-
-						$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.
-
-		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();
-
-	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;
-			}
-
-			$id = $objecttmp->id; // For builddoc action
-
-			// Builddoc
-			$donotredirect = 1;
-			$upload_dir = $conf->facture->dir_output;
-			$permissioncreate=$user->rights->facture->creer;
-			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-		}
-
-		$massaction = $action = 'confirm_createbills';
-	}
-
-	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);
-
-		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++;
-	}
+    $orders = GETPOST('toselect','array');
+    $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+    $validate_invoices = GETPOST('valdate_invoices', 'int');
+
+    $TFact = array();
+    $TFactThird = array();
+
+    $nb_bills_created = 0;
+
+    $db->begin();
+
+    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 {
+
+            $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;
+
+            $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+            if (empty($datefacture))
+            {
+                $datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+            }
+
+            $objecttmp->date = $datefacture;
+            $objecttmp->origin    = 'commande';
+            $objecttmp->origin_id = $id_order;
+
+            $res = $objecttmp->create($user);
+
+            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 (! $db->query($sql))
+            {
+                $error++;
+            }
+
+            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);
+
+                for ($i=0;$i<$num;$i++)
+                {
+                    $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+                    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;
+                        }
+
+                        $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.
+
+        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();
+
+    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;
+            }
+
+            $id = $objecttmp->id; // For builddoc action
+
+            // Builddoc
+            $donotredirect = 1;
+            $upload_dir = $conf->facture->dir_output;
+            $permissioncreate=$user->rights->facture->creer;
+            include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+        }
+
+        $massaction = $action = 'confirm_createbills';
+    }
+
+    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);
+
+        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;
-
-
-	$orders = GETPOST('toselect', 'array');
-	foreach ($orders as $id_order)
-	{
-
-		$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 ($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();
-	}
+    $db->begin();
+
+    $nbok = 0;
+
+
+    $orders = GETPOST('toselect', 'array');
+    foreach ($orders as $id_order)
+    {
+
+        $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 ($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;
-	}
-
-	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;
-		}
-	}
-
-	$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;
-			}
-		}
-	}
-
-	// 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);
-
-		// 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 (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);
-			}
-
-			$cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
-			exec($cmd);
-
-			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);
-
-		$pdf=pdf_getInstance($format);
-
-		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);
-
-		// 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);
-
-		// 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));
-
-			$langs->load("exports");
-			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
-		}
-		else
-		{
-		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
-		}
-	}
+    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';
+
+    $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);
+
+    // 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);
+    }
+
+    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);
+
+        // 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';
+
+            $input_files = '';
+            foreach($files as $f) {
+                $input_files.=' '.escapeshellarg($f);
+            }
+
+            $cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
+            exec($cmd);
+
+            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);
+
+        $pdf=pdf_getInstance($format);
+
+        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);
+
+        // 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);
+
+        // 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));
+
+            $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';
-
-	$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='';
+    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='';
 }
 
 // Validate records
 if (! $error && $massaction == 'validate' && $permtocreate)
 {
-	$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();
-
-		$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;
-	}
+    $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();
+
+        $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;
+    }
 }
 // Closed records
 if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclose) {
@@ -1107,127 +1107,127 @@ 
 // 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();
-
-	$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 (!$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 ($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;
+    $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;
+            }
+
+            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 (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 (! $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
 // @TODO : propose model selection
 if (! $error && $massaction == 'generate_doc' && $permtoread)
 {
-	$db->begin();
-
-	$objecttmp=new $objectclass($db);
-	$nbok = 0;
-	foreach($toselect as $toselectid)
-	{
-		$result=$objecttmp->fetch($toselectid);
-		if ($result > 0)
-		{
-			$outputlangs = $langs;
-			$newlang='';
+    $db->begin();
+
+    $objecttmp=new $objectclass($db);
+    $nbok = 0;
+    foreach($toselect as $toselectid)
+    {
+        $result=$objecttmp->fetch($toselectid);
+        if ($result > 0)
+        {
+            $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) && 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->setDefaultLang($newlang);
-			}
+            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->setDefaultLang($newlang);
+            }
 	
-			// To be sure vars is defined
-			if (empty($hidedetails)) $hidedetails=0;
-			if (empty($hidedesc)) $hidedesc=0;
-			if (empty($hideref)) $hideref=0;
-			if (empty($moreparams)) $moreparams=null;
+            // To be sure vars is defined
+            if (empty($hidedetails)) $hidedetails=0;
+            if (empty($hidedesc)) $hidedesc=0;
+            if (empty($hideref)) $hideref=0;
+            if (empty($moreparams)) $moreparams=null;
 			
-			$result= $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-
-			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("RecordsGenerated", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
-		$db->commit();
-	}
-	else
-	{
-		$db->rollback();
-	}
+            $result= $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+
+            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("RecordsGenerated", $nbok), null, 'mesgs');
+        else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+        $db->commit();
+    }
+    else
+    {
+        $db->rollback();
+    }
 }
 
 $parameters['toselect']=$toselect;

Spacing +304 added lines, -304 removed lines

@@ -42,23 +42,23 @@ 
 
 
 // Mass actions. Controls on number of lines checked.
-$maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
-if (! empty($massaction) && count($toselect) < 1)
+$maxformassaction = (empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS) ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
+if (!empty($massaction) && count($toselect) < 1)
 {
 	$error++;
 	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
 }
-if (! $error && is_array($toselect) && count($toselect) > $maxformassaction)
+if (!$error && is_array($toselect) && count($toselect) > $maxformassaction)
 {
-	setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
+	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
+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')
+if (!$error && $massaction == 'confirm_presend')
 {
 	$resaction = '';
 	$nbsent = 0;
@@ -66,64 +66,64 @@ 
 	$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();
 
-	if (! $error)
+	if (!$error)
 	{
-		$thirdparty=new Societe($db);
-		if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
-		if ($objecttmp->element == 'holiday')       $thirdparty=new User($db);
+		$thirdparty = new Societe($db);
+		if ($objecttmp->element == 'expensereport') $thirdparty = new User($db);
+		if ($objecttmp->element == 'holiday')       $thirdparty = new User($db);
 
-		$objecttmp=new $objectclass($db);
-		foreach($toselect as $toselectid)
+		$objecttmp = new $objectclass($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);
+			$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;
-				$listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
-				$listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
+				$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;
+				$listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
+				$listofobjectref[$thirdpartyid][$toselectid] = $objecttmp;
 			}
 		}
 	}
 
 	// Check mandatory parameters
-	if (GETPOST('fromtype','alpha') === 'user' && empty($user->email))
+	if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email))
 	{
 		$error++;
 		setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
-		$massaction='presend';
+		$massaction = 'presend';
 	}
 
-	$receiver=$_POST['receiver'];
-	if (! is_array($receiver))
+	$receiver = $_POST['receiver'];
+	if (!is_array($receiver))
 	{
-		if (empty($receiver) || $receiver == '-1') $receiver=array();
-		else $receiver=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
+	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';
+	   	$massaction = 'presend';
 	}
 
-	if (! GETPOST('subject','none'))
+	if (!GETPOST('subject', 'none'))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTopic")), null, 'warnings');
-		$massaction='presend';
+		$massaction = 'presend';
 	}
 
 	// Loop on each recipient/thirdparty
-	if (! $error)
+	if (!$error)
 	{
 		foreach ($listofobjectthirdparties as $thirdpartyid)
 		{
@@ -134,21 +134,21 @@ 
 				exit;
 			}
 
-			$sendto='';
-			$sendtocc='';
-			$sendtobcc='';
+			$sendto = '';
+			$sendtocc = '';
+			$sendtobcc = '';
 			$sendtoid = array();
 
 			// Define $sendto
-			$tmparray=array();
+			$tmparray = array();
 			if (trim($_POST['sendto']))
 			{
 				// Recipients are provided into free text
 				$tmparray[] = trim($_POST['sendto']);
 			}
-			if (count($receiver)>0)
+			if (count($receiver) > 0)
 			{
-				foreach($receiver as $key=>$val)
+				foreach ($receiver as $key=>$val)
 				{
 					// Recipient was provided from combo list
 					if ($val == 'thirdparty') // Id of third party or user
@@ -157,28 +157,28 @@ 
 					}
 					elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
 					{
-						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						$sendtoid[] = $val;
 					}
 				}
 			}
-			$sendto=implode(',',$tmparray);
+			$sendto = implode(',', $tmparray);
 
 			// Define $sendtocc
-			$receivercc=$_POST['receivercc'];
-			if (! is_array($receivercc))
+			$receivercc = $_POST['receivercc'];
+			if (!is_array($receivercc))
 			{
-				if ($receivercc == '-1') $receivercc=array();
-				else $receivercc=array($receivercc);
+				if ($receivercc == '-1') $receivercc = array();
+				else $receivercc = array($receivercc);
 			}
-			$tmparray=array();
+			$tmparray = array();
 			if (trim($_POST['sendtocc']))
 			{
 				$tmparray[] = trim($_POST['sendtocc']);
 			}
 			if (count($receivercc) > 0)
 			{
-				foreach($receivercc as $key=>$val)
+				foreach ($receivercc as $key=>$val)
 				{
 					// Recipient was provided from combo list
 					if ($val == 'thirdparty') // Id of third party
@@ -187,41 +187,41 @@ 
 					}
 					elseif ($val)	// Id du contact
 					{
-						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 					}
 				}
 			}
-			$sendtocc=implode(',',$tmparray);
+			$sendtocc = implode(',', $tmparray);
 
 			//var_dump($listofobjectref);exit;
-			$attachedfiles=array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
-			$listofqualifiedobj=array();
-			$listofqualifiedref=array();
-			$thirdpartywithoutemail=array();
+			$attachedfiles = array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
+			$listofqualifiedobj = array();
+			$listofqualifiedref = array();
+			$thirdpartywithoutemail = array();
 
-			foreach($listofobjectref[$thirdpartyid] as $objectid => $objectobj)
+			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>';
+					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyProposalNotDraftCanBeSentInMassAction', $objectobj->ref).'</div><br>';
 					continue; // Payment done or started or canceled
 				}
 				if ($objectclass == 'Commande' && $objectoj->statut == Commande::STATUS_DRAFT)
 				{
 					$langs->load("errors");
 					$nbignored++;
-					$resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction',$objectobj->ref).'</div><br>';
+					$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>';
+					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyInvoiceValidatedCanBeSentInMassAction', $objectobj->ref).'</div><br>';
 					continue; // Payment done or started or canceled
 				}
 
@@ -247,10 +247,10 @@ 
 				   	$nbignored++;
 				   	if (empty($thirdpartywithoutemail[$objectobj->thirdparty->id]))
 					{
-						$resaction.='<div class="error">'.$langs->trans('NoRecipientEmail',$objectobj->thirdparty->name).'</div><br>';
+						$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;
+					$thirdpartywithoutemail[$objectobj->thirdparty->id] = 1;
 				   	continue;
 				}
 
@@ -258,33 +258,33 @@ 
 				{
 					// 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';
-					$filedir=$uploaddir . '/' . dol_sanitizeFileName($objectobj->ref);
-					$file = $filedir . '/' . $filename;
+					$filename = dol_sanitizeFileName($objectobj->ref).'.pdf';
+					$filedir = $uploaddir.'/'.dol_sanitizeFileName($objectobj->ref);
+					$file = $filedir.'/'.$filename;
 					$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))
+							$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>';
+							$resaction .= '<div class="error">'.$langs->trans('ErrorCantReadFile', $file).'</div><br>';
 							dol_syslog('Failed to read file: '.$file, LOG_WARNING);
 							continue;
 					}
 				}
 
 				// Object of thirdparty qualified
-				$listofqualifiedobj[$objectid]=$objectobj;
-				$listofqualifiedref[$objectid]=$objectobj->ref;
+				$listofqualifiedobj[$objectid] = $objectobj;
+				$listofqualifiedref[$objectid] = $objectobj->ref;
 
 
 				//var_dump($listofqualifiedref);
@@ -297,21 +297,21 @@ 
 
 				$fromtype = GETPOST('fromtype');
 				if ($fromtype === 'user') {
-					$from = $user->getFullName($langs) .' <'.$user->email.'>';
+					$from = $user->getFullName($langs).' <'.$user->email.'>';
 				}
 				elseif ($fromtype === 'company') {
-					$from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+					$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);
+					$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);
+					$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];
+					$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)
@@ -320,25 +320,25 @@ 
 					}
 				}
 				else {
-					$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+					$from = $_POST['fromname'].' <'.$_POST['frommail'].'>';
 				}
 
 				$replyto = $from;
-				$subject = GETPOST('subject','none');
-				$message = GETPOST('message','none');
+				$subject = GETPOST('subject', 'none');
+				$message = GETPOST('message', 'none');
 
 				$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 == '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));
 
 				// $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)
-				$oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
-				$looparray=array();
-				if (! $oneemailperrecipient)
+				$oneemailperrecipient = (GETPOST('oneemailperrecipient') == 'on' ? 1 : 0);
+				$looparray = array();
+				if (!$oneemailperrecipient)
 				{
 					$looparray = $listofqualifiedobj;
 					foreach ($looparray as $key => $objecttmp)
@@ -348,34 +348,34 @@ 
 				}
 				else
 				{
-					$objectforloop=new $objectclass($db);
+					$objectforloop = new $objectclass($db);
 					$objectforloop->thirdparty = $thirdparty;
-					$looparray[0]=$objectforloop;
+					$looparray[0] = $objectforloop;
 				}
 				//var_dump($looparray);exit;
 
 				foreach ($looparray as $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per record
 				{
 					// 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 = 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 ) ) {
+					if (!empty($listofobjectthirdparties)) {
 						$parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
 					}
-					if ( ! empty( $listofobjectref ) ) {
+					if (!empty($listofobjectref)) {
 						$parameters['listofobjectref'] = $listofobjectref;
 					}
 
 					complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
 
-					$subject=make_substitutions($subject, $substitutionarray);
-					$message=make_substitutions($message, $substitutionarray);
+					$subject = make_substitutions($subject, $substitutionarray);
+					$message = make_substitutions($message, $substitutionarray);
 
 					$filepath = $attachedfiles['paths'];
 					$filename = $attachedfiles['names'];
@@ -384,44 +384,44 @@ 
 					// 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;
+						$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';
-
-						$trackid.=$objecttmp->id;
+						$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';
+
+						$trackid .= $objecttmp->id;
 					}
 					//var_dump($filepath);
 					//var_dump($trackid);exit;
 
 					// Send mail (substitutionarray must be done just before this)
 					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid);
+					$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid);
 					if ($mailfile->error)
 					{
-						$resaction.='<div class="error">'.$mailfile->error.'</div>';
+						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
 					}
 					else
 					{
-						$result=$mailfile->sendfile();
+						$result = $mailfile->sendfile();
 						if ($result)
 						{
-							$resaction.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)).'<br>';		// Must not contain "
+							$resaction .= $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)).'<br>'; // Must not contain "
 
-							$error=0;
+							$error = 0;
 
 							// Insert logs into agenda
-							foreach($listofqualifiedobj as $objid => $objectobj)
+							foreach ($listofqualifiedobj as $objid => $objectobj)
 							{
 								/*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
 	                            if ($objectclass == 'Commande') $actiontypecode='AC_COM';
@@ -430,24 +430,24 @@ 
 	                            if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
 	                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
 
-								$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+								$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') . ": " . $subject);
-									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 									$actionmsg = dol_concatdesc($actionmsg, $message);
 								}
-								$actionmsg2='';
+								$actionmsg2 = '';
 
 								// Initialisation donnees
-								$objectobj->sendtoid		= 0;
-								$objectobj->actionmsg		= $actionmsg;  // Long text
+								$objectobj->sendtoid = 0;
+								$objectobj->actionmsg = $actionmsg; // Long text
 								$objectobj->actionmsg2		= $actionmsg2; // Short text
 								$objectobj->fk_element		= $objid;
 								$objectobj->elementtype	= $objectobj->element;
 
-								$triggername = strtoupper(get_class($objectobj)) .'_SENTBYMAIL';
+								$triggername = strtoupper(get_class($objectobj)).'_SENTBYMAIL';
 								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
 								if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
 								if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
@@ -457,13 +457,13 @@ 
 								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
 								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
 
-								if (! empty($triggername))
+								if (!empty($triggername))
 								{
 									// Appel des triggers
-									include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-									$interface=new Interfaces($db);
-									$result=$interface->run_triggers($triggername, $objectobj, $user, $langs, $conf);
-									if ($result < 0) { $error++; $errors=$interface->errors; }
+									include_once DOL_DOCUMENT_ROOT."/core/class/interfaces.class.php";
+									$interface = new Interfaces($db);
+									$result = $interface->run_triggers($triggername, $objectobj, $user, $langs, $conf);
+									if ($result < 0) { $error++; $errors = $interface->errors; }
 									// Fin appel triggers
 
 									if ($error)
@@ -481,12 +481,12 @@ 
 							$langs->load("other");
 							if ($mailfile->error)
 							{
-								$resaction.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-								$resaction.='<br><div class="error">'.$mailfile->error.'</div>';
+								$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 .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							}
 						}
 					}
@@ -494,15 +494,15 @@ 
 			}
 		}
 
-		$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
+			$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');
@@ -513,14 +513,14 @@ 
 			setEventMessages($resaction, null, 'warnings');
 		}
 
-		$action='list';
-		$massaction='';
+		$action = 'list';
+		$massaction = '';
 	}
 }
 
 if ($massaction == 'confirm_createbills')
 {
-	$orders = GETPOST('toselect','array');
+	$orders = GETPOST('toselect', 'array');
 	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
 	$validate_invoices = GETPOST('valdate_invoices', 'int');
 
@@ -531,7 +531,7 @@ 
 
 	$db->begin();
 
-	foreach($orders as $id_order)
+	foreach ($orders as $id_order)
 	{
 		$cmd = new Commande($db);
 		if ($cmd->fetch($id_order) <= 0) continue;
@@ -544,7 +544,7 @@ 
 			$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->fk_project = $cmd->fk_project;
 
 			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 			if (empty($datefacture))
@@ -558,29 +558,29 @@ 
 
 			$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 (! $db->query($sql))
+			$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 (! $error)
+			if (!$error)
 			{
 				$lines = $cmd->lines;
 				if (empty($lines) && method_exists($cmd, 'fetch_lines'))
@@ -589,27 +589,27 @@ 
 					$lines = $cmd->lines;
 				}
 
-				$fk_parent_line=0;
-				$num=count($lines);
+				$fk_parent_line = 0;
+				$num = count($lines);
 
-				for ($i=0;$i<$num;$i++)
+				for ($i = 0; $i < $num; $i++)
 				{
-					$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+					$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
 					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);
+						$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 = $objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
 						}
 						else
@@ -622,17 +622,17 @@ 
 					else
 					{
 						// Positive line
-						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+						$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_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;
+						$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)
 						{
@@ -674,11 +674,11 @@ 
 							);
 						if ($result > 0)
 						{
-							$lineid=$result;
+							$lineid = $result;
 						}
 						else
 						{
-							$lineid=0;
+							$lineid = 0;
 							$error++;
 							break;
 						}
@@ -694,7 +694,7 @@ 
 
 		//$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;
+		if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $objecttmp;
 		else $TFact[$objecttmp->id] = $objecttmp;
 	}
 
@@ -702,10 +702,10 @@ 
 	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
 	$toselect = array();
 
-	if (! $error && $validate_invoices)
+	if (!$error && $validate_invoices)
 	{
 		$massaction = $action = 'builddoc';
-		foreach($TAllFact as &$objecttmp)
+		foreach ($TAllFact as &$objecttmp)
 		{
 			$result = $objecttmp->validate($user);
 			if ($result <= 0)
@@ -720,43 +720,43 @@ 
 			// Builddoc
 			$donotredirect = 1;
 			$upload_dir = $conf->facture->dir_output;
-			$permissioncreate=$user->rights->facture->creer;
+			$permissioncreate = $user->rights->facture->creer;
 			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 		}
 
 		$massaction = $action = 'confirm_createbills';
 	}
 
-	if (! $error)
+	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);
+		$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;
@@ -764,9 +764,9 @@ 
 	else
 	{
 		$db->rollback();
-		$action='create';
-		$_GET["origin"]=$_POST["origin"];
-		$_GET["originid"]=$_POST["originid"];
+		$action = 'create';
+		$_GET["origin"] = $_POST["origin"];
+		$_GET["originid"] = $_POST["originid"];
 		setEventMessages("Error", null, 'errors');
 		$error++;
 	}
@@ -822,7 +822,7 @@ 
 }
 
 
-if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search'))
+if (!$error && $massaction == "builddoc" && $permtoread && !GETPOST('button_search'))
 {
 	if (empty($diroutputmassaction))
 	{
@@ -834,36 +834,36 @@ 
 	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);
+	$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);
+		$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;
+			$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)
+	foreach ($listofobjectref as $basename)
 	{
 		$basename = dol_sanitizeFileName($basename);
-		foreach($listoffiles as $filefound)
+		foreach ($listoffiles as $filefound)
 		{
-			if (strstr($filefound["name"],$basename))
+			if (strstr($filefound["name"], $basename))
 			{
 				$files[] = $uploaddir.'/'.$basename.'/'.$filefound["name"];
 				break;
@@ -873,12 +873,12 @@ 
 
 	// 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))
+	$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 = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
 
@@ -888,36 +888,36 @@ 
 		dol_mkdir($diroutputmassaction);
 
 		// Defined name of merged file
-		$filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
-		$filename=preg_replace('/\s/','_',$filename);
+		$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 ($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 ($year) $filename .= '_'.$year;
+		if ($month) $filename .= '_'.$month;
 
-		if (count($files)>0)
+		if (count($files) > 0)
 		{
-			$now=dol_now();
-			$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+			$now = dol_now();
+			$file = $diroutputmassaction.'/'.$filename.'_'.dol_print_date($now, 'dayhourlog').'.pdf';
 
 			$input_files = '';
-			foreach($files as $f) {
-				$input_files.=' '.escapeshellarg($f);
+			foreach ($files as $f) {
+				$input_files .= ' '.escapeshellarg($f);
 			}
 
 			$cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
 			exec($cmd);
 
-			if (! empty($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');
+			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
 		}
 		else
 		{
@@ -926,12 +926,12 @@ 
 	}
 	else {
 		// Create empty PDF
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$page_largeur = $formatarray['width'];
 		$page_hauteur = $formatarray['height'];
-		$format = array($page_largeur,$page_hauteur);
+		$format = array($page_largeur, $page_hauteur);
 
-		$pdf=pdf_getInstance($format);
+		$pdf = pdf_getInstance($format);
 
 		if (class_exists('TCPDF'))
 		{
@@ -940,10 +940,10 @@ 
 		}
 		$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)
+		foreach ($files as $file)
 		{
 			// Charge un document PDF depuis un fichier.
 			$pagecount = $pdf->setSourceFile($file);
@@ -960,27 +960,27 @@ 
 		dol_mkdir($diroutputmassaction);
 
 		// Defined name of merged file
-		$filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
-		$filename=preg_replace('/\s/','_',$filename);
+		$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 ($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 ($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))
+			$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');
+			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
 		}
 		else
 		{
@@ -996,38 +996,38 @@ 
 
 	$langs->load("other");
 	$upload_dir = $diroutputmassaction;
-	$file = $upload_dir . '/' . GETPOST('file');
-	$ret=dol_delete_file($file);
+	$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='';
+	$action = '';
 }
 
 // Validate records
-if (! $error && $massaction == 'validate' && $permtocreate)
+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))
+	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))
+	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)
+	if (!$error)
 	{
 		$db->begin();
 
 		$nbok = 0;
-		foreach($toselect as $toselectid)
+		foreach ($toselect as $toselectid)
 		{
-			$result=$objecttmp->fetch($toselectid);
+			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0)
 			{
 				//if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
@@ -1056,7 +1056,7 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
@@ -1105,15 +1105,15 @@ 
     }
 }
 // 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)
+if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permtodelete)
 {
 	$db->begin();
 
-	$objecttmp=new $objectclass($db);
+	$objecttmp = new $objectclass($db);
 	$nbok = 0;
-	foreach($toselect as $toselectid)
+	foreach ($toselect as $toselectid)
 	{
-		$result=$objecttmp->fetch($toselectid);
+		$result = $objecttmp->fetch($toselectid);
 		if ($result > 0)
 		{
 			// Refuse deletion for some objects/status
@@ -1121,7 +1121,7 @@ 
 			{
 				$langs->load("errors");
 				$nbignored++;
-				$resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$objecttmp->ref).'</div><br>';
+				$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction', $objecttmp->ref).'</div><br>';
 				continue;
 			}
 
@@ -1156,7 +1156,7 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
 		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
@@ -1171,36 +1171,36 @@ 
 
 // Generate document foreach object according to model linked to object
 // @TODO : propose model selection
-if (! $error && $massaction == 'generate_doc' && $permtoread)
+if (!$error && $massaction == 'generate_doc' && $permtoread)
 {
 	$db->begin();
 
-	$objecttmp=new $objectclass($db);
+	$objecttmp = new $objectclass($db);
 	$nbok = 0;
-	foreach($toselect as $toselectid)
+	foreach ($toselect as $toselectid)
 	{
-		$result=$objecttmp->fetch($toselectid);
+		$result = $objecttmp->fetch($toselectid);
 		if ($result > 0)
 		{
 			$outputlangs = $langs;
-			$newlang='';
+			$newlang = '';
 	
-			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))
+			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);
 			}
 	
 			// To be sure vars is defined
-			if (empty($hidedetails)) $hidedetails=0;
-			if (empty($hidedesc)) $hidedesc=0;
-			if (empty($hideref)) $hideref=0;
-			if (empty($moreparams)) $moreparams=null;
+			if (empty($hidedetails)) $hidedetails = 0;
+			if (empty($hidedesc)) $hidedesc = 0;
+			if (empty($hideref)) $hideref = 0;
+			if (empty($moreparams)) $moreparams = null;
 			
-			$result= $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result = $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
 			if ($result <= 0)
 			{
@@ -1218,7 +1218,7 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
 		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
@@ -1230,10 +1230,10 @@ 
 	}
 }
 
-$parameters['toselect']=$toselect;
-$parameters['uploaddir']=$uploaddir;
+$parameters['toselect'] = $toselect;
+$parameters['uploaddir'] = $uploaddir;
 
-$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');
 
 

Braces +372 added lines, -189 removed lines

@@ -54,10 +54,12 @@ 
 	$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
+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';
 }
+}
 if (! $error && $massaction == 'confirm_presend')
 {
 	$resaction = '';
@@ -73,8 +75,12 @@ 
 	if (! $error)
 	{
 		$thirdparty=new Societe($db);
-		if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
-		if ($objecttmp->element == 'holiday')       $thirdparty=new User($db);
+		if ($objecttmp->element == 'expensereport') {
+		    $thirdparty=new User($db);
+		}
+		if ($objecttmp->element == 'holiday') {
+		    $thirdparty=new User($db);
+		}
 
 		$objecttmp=new $objectclass($db);
 		foreach($toselect as $toselectid)
@@ -85,9 +91,15 @@ 
 			{
 				$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 ($objecttmp->element == 'societe') {
+				    $thirdpartyid=$objecttmp->id;
+				}
+				if ($objecttmp->element == 'expensereport') {
+				    $thirdpartyid=$objecttmp->fk_user_author;
+				}
+				if ($objecttmp->element == 'holiday') {
+				    $thirdpartyid=$objecttmp->fk_user;
+				}
 				$listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
 				$listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
 			}
@@ -105,12 +117,17 @@ 
 	$receiver=$_POST['receiver'];
 	if (! is_array($receiver))
 	{
-		if (empty($receiver) || $receiver == '-1') $receiver=array();
-		else $receiver=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
+	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';
 	}
@@ -151,13 +168,16 @@ 
 				foreach($receiver as $key=>$val)
 				{
 					// Recipient was provided from combo list
-					if ($val == 'thirdparty') // Id of third party or user
+					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
+					} elseif ($val && method_exists($thirdparty, 'contact_get_property')) {
+					    // Id of contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					}
 						$sendtoid[] = $val;
 					}
 				}
@@ -168,8 +188,11 @@ 
 			$receivercc=$_POST['receivercc'];
 			if (! is_array($receivercc))
 			{
-				if ($receivercc == '-1') $receivercc=array();
-				else $receivercc=array($receivercc);
+				if ($receivercc == '-1') {
+				    $receivercc=array();
+				} else {
+				    $receivercc=array($receivercc);
+				}
 			}
 			$tmparray=array();
 			if (trim($_POST['sendtocc']))
@@ -181,13 +204,16 @@ 
 				foreach($receivercc as $key=>$val)
 				{
 					// Recipient was provided from combo list
-					if ($val == 'thirdparty') // Id of third party
+					if ($val == 'thirdparty') {
+					    // Id of third party
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 					}
-					elseif ($val)	// Id du contact
+					} elseif ($val) {
+					    // Id du contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					}
 						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 					}
 				}
@@ -226,15 +252,16 @@ 
 				}
 
 				// Test recipient
-				if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
+				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;
-					}
-					else
+					} else
 					{
 						$objectobj->fetch_thirdparty();
 						$sendto = $objectobj->thirdparty->email;
@@ -271,8 +298,7 @@ 
 							'names'=>array_merge($attachedfiles['names'],array($filename)),
 							'mimes'=>array_merge($attachedfiles['mimes'],array($mime))
 							);
-					}
-					else
+					} else
 					{
 							$nbignored++;
 							$langs->load("errors");
@@ -298,19 +324,15 @@ 
 				$fromtype = GETPOST('fromtype');
 				if ($fromtype === 'user') {
 					$from = $user->getFullName($langs) .' <'.$user->email.'>';
-				}
-				elseif ($fromtype === 'company') {
+				} elseif ($fromtype === 'company') {
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-				}
-				elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+				} 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)) {
+				} 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)) {
+				} 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);
@@ -318,8 +340,7 @@ 
 					{
 						$from = $obj->label.' <'.$obj->email.'>';
 					}
-				}
-				else {
+				} else {
 					$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
 				}
 
@@ -328,12 +349,24 @@ 
 				$message = GETPOST('message','none');
 
 				$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 == '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));
+				}
 
 				// $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)
 				$oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
@@ -345,8 +378,7 @@ 
 					{
 						$looparray[$key]->thirdparty = $thirdparty;
 					}
-				}
-				else
+				} else
 				{
 					$objectforloop=new $objectclass($db);
 					$objectforloop->thirdparty = $thirdparty;
@@ -354,10 +386,12 @@ 
 				}
 				//var_dump($looparray);exit;
 
-				foreach ($looparray as $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per record
+				foreach ($looparray as $objecttmp) {
+				    // $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per record
 				{
 					// 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;
@@ -385,19 +419,36 @@ 
 					if ($oneemailperrecipient)
 					{
 						$trackid='thi'.$thirdparty->id;
-						if ($objecttmp->element == 'expensereport') $trackid='use'.$thirdparty->id;
-						if ($objecttmp->element == 'holiday') $trackid='use'.$thirdparty->id;
-					}
-					else
+						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';
+						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';
+						}
 
 						$trackid.=$objecttmp->id;
 					}
@@ -410,8 +461,7 @@ 
 					if ($mailfile->error)
 					{
 						$resaction.='<div class="error">'.$mailfile->error.'</div>';
-					}
-					else
+					} else
 					{
 						$result=$mailfile->sendfile();
 						if ($result)
@@ -433,7 +483,9 @@ 
 								$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 								if ($message)
 								{
-									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+									if ($sendtocc) {
+									    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+									}
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
 									$actionmsg = dol_concatdesc($actionmsg, $message);
@@ -448,14 +500,30 @@ 
 								$objectobj->elementtype	= $objectobj->element;
 
 								$triggername = strtoupper(get_class($objectobj)) .'_SENTBYMAIL';
-								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
-								if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
-								if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
-								if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYMAIL';
-								if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
-								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
-								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
-								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
+								if ($triggername == 'SOCIETE_SENTBYMAIL') {
+								    $triggername = 'COMPANY_SENTBYEMAIL';
+								}
+								if ($triggername == 'CONTRAT_SENTBYMAIL') {
+								    $triggername = 'CONTRACT_SENTBYEMAIL';
+								}
+								if ($triggername == 'COMMANDE_SENTBYMAIL') {
+								    $triggername = 'ORDER_SENTBYEMAIL';
+								}
+								if ($triggername == 'FACTURE_SENTBYMAIL') {
+								    $triggername = 'BILL_SENTBYMAIL';
+								}
+								if ($triggername == 'EXPEDITION_SENTBYMAIL') {
+								    $triggername = 'SHIPPING_SENTBYEMAIL';
+								}
+								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') {
+								    $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+								}
+								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') {
+								    $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
+								}
+								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') {
+								    $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
+								}
 
 								if (! empty($triggername))
 								{
@@ -475,16 +543,14 @@ 
 
 								$nbsent++;
 							}
-						}
-						else
+						} else
 						{
 							$langs->load("other");
 							if ($mailfile->error)
 							{
 								$resaction.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
 								$resaction.='<br><div class="error">'.$mailfile->error.'</div>';
-							}
-							else
+							} else
 							{
 								$resaction.='<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							}
@@ -506,8 +572,7 @@ 
 			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($resaction, null, 'mesgs');
-		}
-		else
+		} else
 		{
 			//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
 			setEventMessages($resaction, null, 'warnings');
@@ -534,10 +599,15 @@ 
 	foreach($orders as $id_order)
 	{
 		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0) continue;
+		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.
+		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 {
 
 			$objecttmp->socid = $cmd->socid;
@@ -558,7 +628,9 @@ 
 
 			$res = $objecttmp->create($user);
 
-			if($res > 0) $nb_bills_created++;
+			if($res > 0) {
+			    $nb_bills_created++;
+			}
 		}
 
 		if ($objecttmp->id > 0)
@@ -611,28 +683,38 @@ 
 						{
 							$result=$objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
-						}
-						else
+						} else
 						{
 							setEventMessages($discount->error, $discount->errors, 'errors');
 							$error++;
 							break;
 						}
-					}
-					else
+					} 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;
+						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;
+						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)
 						{
@@ -675,8 +757,7 @@ 
 						if ($result > 0)
 						{
 							$lineid=$result;
-						}
-						else
+						} else
 						{
 							$lineid=0;
 							$error++;
@@ -694,8 +775,11 @@ 
 
 		//$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
@@ -734,34 +818,79 @@ 
 
 		// 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);
+		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
+	} else
 	{
 		$db->rollback();
 		$action='create';
@@ -785,8 +914,9 @@ 
 	{
 
 		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0)
-			continue;
+		if ($cmd->fetch($id_order) <= 0) {
+					continue;
+		}
 
 		if ($cmd->statut != Commande::STATUS_VALIDATED)
 		{
@@ -794,28 +924,28 @@ 
 			setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
 			$error++;
 			break;
+		} else {
+					$result = $cmd->cancel();
 		}
-		else
-			$result = $cmd->cancel();
 
 		if ($result < 0)
 		{
 			setEventMessages($cmd->error, $cmd->errors, 'errors');
 			$error++;
 			break;
+		} else {
+					$nbok++;
 		}
-		else
-			$nbok++;
 	}
 	if (!$error)
 	{
-		if ($nbok > 1)
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		} else {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		}
 		$db->commit();
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -852,8 +982,13 @@ 
 	}
 
 	$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
+	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
@@ -874,8 +1009,12 @@ 
 	// 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 ($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);
@@ -894,11 +1033,18 @@ 
 		// 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 ($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 ($year) $filename.='_'.$year;
-		if ($month) $filename.='_'.$month;
 
 		if (count($files)>0)
 		{
@@ -913,18 +1059,17 @@ 
 			$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
+		} else
 		{
 			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		// Create empty PDF
 		$formatarray=pdf_getFormat();
 		$page_largeur = $formatarray['width'];
@@ -940,7 +1085,9 @@ 
 		}
 		$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)
@@ -966,23 +1113,30 @@ 
 		// 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 ($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 ($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));
+			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
+		} else
 		{
 		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
@@ -998,8 +1152,11 @@ 
 	$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');
+	if ($ret) {
+	    setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	} else {
+	    setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	}
 	$action='';
 }
 
@@ -1039,16 +1196,15 @@ 
 					setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
 					$error++;
 					break;
-				}
-				elseif ($result < 0)
+				} elseif ($result < 0)
 				{
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
+				} else {
+				    $nbok++;
 				}
-				else $nbok++;
-			}
-			else
+			} else
 			{
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
@@ -1058,11 +1214,13 @@ 
 
 		if (! $error)
 		{
-			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			if ($nbok > 1) {
+			    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			} else {
+			    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 		}
@@ -1083,10 +1241,10 @@ 
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            } else
-                $nbok++;
-        }
-        else {
+            } else {
+                            $nbok++;
+            }
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1094,13 +1252,13 @@ 
     }
 
     if (!$error) {
-        if ($nbok > 1)
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        else
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        if ($nbok > 1) {
+                    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        } else {
+                    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        }
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
@@ -1137,18 +1295,21 @@ 
 				}
 			}
 
-			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 $nbok++;
-		}
-		else
+		} else
 		{
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1158,11 +1319,13 @@ 
 
 	if (! $error)
 	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+		    setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+		} else {
+		    setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		}
 		$db->commit();
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -1185,9 +1348,17 @@ 
 			$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) && 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 ($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);
@@ -1195,10 +1366,18 @@ 
 			}
 	
 			// To be sure vars is defined
-			if (empty($hidedetails)) $hidedetails=0;
-			if (empty($hidedesc)) $hidedesc=0;
-			if (empty($hideref)) $hideref=0;
-			if (empty($moreparams)) $moreparams=null;
+			if (empty($hidedetails)) {
+			    $hidedetails=0;
+			}
+			if (empty($hidedesc)) {
+			    $hidedesc=0;
+			}
+			if (empty($hideref)) {
+			    $hideref=0;
+			}
+			if (empty($moreparams)) {
+			    $moreparams=null;
+			}
 			
 			$result= $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
@@ -1207,10 +1386,10 @@ 
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
+			} else {
+			    $nbok++;
 			}
-			else $nbok++;
-		}
-		else
+		} else
 		{
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1220,11 +1399,13 @@ 
 
 	if (! $error)
 	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+		    setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
+		} else {
+		    setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		}
 		$db->commit();
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -1234,7 +1415,9 @@ 
 $parameters['uploaddir']=$uploaddir;
 
 $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');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}