diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 0a34a4d4c47..f43c9f8b244 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -40,14 +40,14 @@ $action = GETPOST('action','alpha');
  * Actions
  */
 
-if ($action == 'setMAILING_EMAIL_UNSUBSCRIBE')
-{
-	$res=dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE",1,'chaine',0,'',$conf->entity);
-}
-if ($action == 'unsetMAILING_EMAIL_UNSUBSCRIBE')
-{
-	$res=dolibarr_del_const($db, "MAILING_EMAIL_UNSUBSCRIBE");
-}
+if ($action == 'setMAILING_EMAIL_UNSUBSCRIBE')
+{
+	$res=dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE",1,'chaine',0,'',$conf->entity);
+}
+if ($action == 'unsetMAILING_EMAIL_UNSUBSCRIBE')
+{
+	$res=dolibarr_del_const($db, "MAILING_EMAIL_UNSUBSCRIBE");
+}
 
 if ($action == 'setvalue')
 {
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index d290ec43a75..e928de437b9 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -78,8 +78,6 @@ if ($action == 'del_bookmark' && ! empty($bid))
  * View
  */
 
-$now=dol_now();
-
 $form = new Form($db);
 $formfile = new FormFile($db);
 $companystatic=new Societe($db);
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 7618334aa86..af408cef79d 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -339,7 +339,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes')
 			}
 			else
 			{
-				setEventMessage($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"));
+				setEventMessage($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"));
 			}
 
 			// Loop finished, set global statut of mail
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index fb6fa29902e..895f922395d 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -43,7 +43,7 @@ $result = restrictedArea($user, 'propal');
 /*
  * View
  */
-
+$now=dol_now();
 $propalstatic=new Propal($db);
 $companystatic=new Societe($db);
 $form = new Form($db);
@@ -288,7 +288,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 
 	$now=dol_now();
 
-	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp";
+	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -328,7 +328,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 				print $propalstatic->getNomUrl(1);
 				print '</td>';
 				print '<td width="18" class="nobordernopadding" nowrap="nowrap">';
-				if ($db->jdate($obj->dp) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
 				print '</td>';
 				print '<td width="16" align="center" class="nobordernopadding">';
 				$filename=dol_sanitizeFileName($obj->ref);
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index 12f0bd36978..cf042bccc49 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -31,10 +31,10 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't nee
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
 
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 
-$langs->load('compta');
+$langs->load('compta');
 
 
 /*
@@ -51,20 +51,20 @@ $currentInvId = $_POST['imgClicked'];		// from DOM elements : imgId (equals invo
 // from text inputs : total amount
 $amountPayment = $amountPayment!='' ? 	( is_numeric(price2num($amountPayment))	? price2num($amountPayment) : '' ) : '';			// keep void if not a valid entry
 
-// Clean checkamounts
-foreach ($amounts as $key => $value)
-{
-	$value = price2num($value);
-	$amounts[$key]=$value;
-	if (empty($value)) unset($amounts[$key]);
-}
-// Clean remains
-foreach ($remains as $key => $value)
-{
-	$value = price2num($value);
-	$remains[$key]=$value;
-	if (empty($value)) unset($remains[$key]);
-}
+// Clean checkamounts
+foreach ($amounts as $key => $value)
+{
+	$value = price2num($value);
+	$amounts[$key]=$value;
+	if (empty($value)) unset($amounts[$key]);
+}
+// Clean remains
+foreach ($remains as $key => $value)
+{
+	$value = price2num($value);
+	$remains[$key]=$value;
+	if (empty($value)) unset($remains[$key]);
+}
 
 // Treatment
 $result = $amountPayment != '' ? ($amountPayment - array_sum($amounts)) : ($amountPayment + array_sum($amounts));					// Remaining amountPayment
@@ -111,8 +111,8 @@ if ($currentInvId)																	// Here to breakdown
 }
 
 $toJsonArray['makeRed'] = ($totalRemaining < price2num($result) || price2num($result) < 0) ? true : false;
-$toJsonArray['result'] = price($result);		// Return value to user format
-$toJsonArray['resultnum'] = price2num($result);	// Return value to numeric format
+$toJsonArray['result'] = price($result);		// Return value to user format
+$toJsonArray['resultnum'] = price2num($result);	// Return value to numeric format
 
 // Encode to JSON to return
 echo dol_json_encode($toJsonArray);	// Printing the call's result
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 39414b0960d..0f12ab0cfc8 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1184,7 +1184,7 @@ class BonPrelevement extends CommonObject
         {
         	if (! empty($conf->esaeb->enabled))
             {
-            	dol_include_once('/esaeb/class/esaeb19.class.php');
+            	dol_include_once('/esaeb/class/esaeb19.class.php');
 
                 //Head
                 $esaeb19 = new AEB19DocWritter;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dc25d81344d..2cce0fcbdfa 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2231,6 +2231,9 @@ class Form
         $inputok=array();
         $inputko=array();
 
+        // Clean parameters
+        $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
+        
         if (is_array($formquestion) && ! empty($formquestion))
         {
             $more.='<table class="paddingrightonly" width="100%">'."\n";
@@ -2337,7 +2340,15 @@ class Form
             $formconfirm.='
             $(function() {
             	$( "#'.$dialogconfirm.'" ).dialog({
-                    autoOpen: '.($autoOpen ? "true" : "false").',
+                    autoOpen: '.($autoOpen ? "true" : "false").',';
+            		if ($newselectedchoice == 'no')
+            		{
+						$formconfirm.='
+						open: function() {
+            				$(this).parent().find("button.ui-button:eq(1)").focus();
+						},';
+            		}
+        			$formconfirm.='
                     resizable: false,
                     height: "'.$height.'",
                     width: "'.$width.'",
@@ -2383,11 +2394,12 @@ class Form
                     }
                 });
 
+                
             	var button = "'.$button.'";
                 if (button.length > 0) {
                 	$( "#" + button ).click(function() {
                 		$("#'.$dialogconfirm.'").dialog("open");
-                	});
+        			});
                 }
             });
             </script>';
@@ -2417,7 +2429,6 @@ class Form
             $formconfirm.= '<tr class="valid">';
             $formconfirm.= '<td class="valid">'.$question.'</td>';
             $formconfirm.= '<td class="valid">';
-            $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
             $formconfirm.= $this->selectyesno("confirm",$newselectedchoice);
             $formconfirm.= '</td>';
             $formconfirm.= '<td class="valid" align="center"><input class="button" type="submit" value="'.$langs->trans("Validate").'"></td>';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 82a6dadcfb8..824d326883d 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -48,8 +48,9 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 					var options = '.json_encode($ajaxoptions).';
 
 					// Remove product id before select another product
-					$("input#search_'.$htmlname.'").change(function() {
-						$("#'.$htmlname.'").val("").trigger("change");
+					// use keyup instead change to avoid loosing the product id
+					$("input#search_'.$htmlname.'").keyup(function() {
+							$("#'.$htmlname.'").val("").trigger("change");
 					});
 					// Check when keyup
 					$("input#search_'.$htmlname.'").onDelayedKeyup({ handler: function() {
@@ -163,7 +164,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 					}).data( "autocomplete" )._renderItem = function( ul, item ) {
 						return $( "<li></li>" )
 						.data( "item.autocomplete", item )
-						.append( \'<a href="#"><span class="tag">\' + item.label + "</span></a>" )
+						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )
 						.appendTo(ul);
 					};
   				});';
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index b0d2c997d05..88c6ee49f09 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -759,25 +759,30 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0)
 }
 
 /**
- *	Fonction retournant le nombre de jour entre deux dates sans les jours feries (jours ouvres)
+ *	Function to return number of working days (and text of units) between two dates (jours ouvres)
  *
- *	@param	   timestamp	$timestampStart     Timestamp de debut
- *	@param	   timestamp	$timestampEnd       Timestamp de fin
- *	@param     int			$inhour             0: sort le nombre de jour , 1: sort le nombre d'heure (72 max)
- *	@param     int			$lastday            We include last day, 0: non, 1:oui
- *	@return    int								Nombre de jours ou d'heures
+ *	@param	   timestamp	$timestampStart     Timestamp for start date
+ *	@param	   timestamp	$timestampEnd       Timestamp for end date
+ *	@param     int			$inhour             0: return number of days, 1: return number of hours (72 max)
+ *	@param     int			$lastday            We include last day, 0: no, 1:yes
+ *	@return    int								Number of days or hours
  */
 function num_open_day($timestampStart, $timestampEnd,$inhour=0,$lastday=0)
 {
 	global $langs;
 
 	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday);
+	
+	// Check parameters
+	if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
+	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
 	if ($timestampStart < $timestampEnd)
 	{
 		//print num_between_day($timestampStart, $timestampEnd, $lastday).' - '.num_public_holiday($timestampStart, $timestampEnd);
 		$nbOpenDay = num_between_day($timestampStart, $timestampEnd, $lastday) - num_public_holiday($timestampStart, $timestampEnd, $lastday);
-		$nbOpenDay.= " ".$langs->trans("Days");
+		$nbOpenDay.= " " . $langs->trans("Days");
 		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
 		return $nbOpenDay;
 	}
@@ -785,7 +790,7 @@ function num_open_day($timestampStart, $timestampEnd,$inhour=0,$lastday=0)
 	{
 		$nbOpenDay=$lastday;
 		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
-		return $nbOpenDay=1;
+		return $nbOpenDay;
 	}
 	else
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 94e1a191c57..d9d8703680c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2190,17 +2190,18 @@ function dol_print_error($db='',$error='')
 }
 
 /**
- * Show email to contact if technical error
+ * Show a public email and error code to contact if technical error
  *
+ * @param	string	$prefixcode		Prefix of public error code		
  * @return	void
  */
-function dol_print_error_email()
+function dol_print_error_email($prefixcode)
 {
 	global $langs,$conf;
 
 	$langs->load("errors");
 	$now=dol_now();
-	print '<br><div class="error">'.$langs->trans("ErrorContactEMail",$conf->global->MAIN_INFO_SOCIETE_MAIL,'ERRORNEWPAYMENT'.dol_print_date($now,'%Y%m%d')).'</div>';
+	print '<br><div class="error">'.$langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d')).'</div>';
 }
 
 /**
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index a6f6d717c94..76396dfee7e 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -74,7 +74,7 @@ class modExpedition extends DolibarrModules
 		$this->depends = array("modCommande");
 		$this->requiredby = array();
 		$this->conflictwith = array();
-		$this->langfiles = array('deliveries','sendings');
+		$this->langfiles = array('deliveries','sendings');
 
 		// Constantes
 		$this->const = array();
@@ -192,25 +192,25 @@ class modExpedition extends DolibarrModules
 		$this->rights[$r][4] = 'livraison';
 		$this->rights[$r][5] = 'supprimer';
 
-		// Exports
-		//--------
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note'=>"Note",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','s.libelle'=>'List:c_pays:libelle:rowid','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','s.libelle'=>'List:c_pays:libelle:rowid','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Number",'c.height'=>"Number",'c.width'=>"Number",'c.weight'=>"Number",'c.fk_statut'=>'Status','c.note'=>"Text",'ed.qty'=>"Number");
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
-		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'expedition as c, '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'expeditiondet as ed, '.MAIN_DB_PREFIX.'commandedet as cd)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
-		$this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity;
+		// Exports
+		//--------
+		$r=0;
+
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r]=array(array("expedition","shipment","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note'=>"Note",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','s.libelle'=>'List:c_pays:libelle:rowid','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','s.libelle'=>'List:c_pays:libelle:rowid','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Number",'c.height'=>"Number",'c.width'=>"Number",'c.weight'=>"Number",'c.fk_statut'=>'Status','c.note'=>"Text",'ed.qty'=>"Number");
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'expedition as c, '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'expeditiondet as ed, '.MAIN_DB_PREFIX.'commandedet as cd)';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
+		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
+		$this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity;
 	}
 
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 0942eb17b4d..7624436b34e 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -65,8 +65,8 @@ class modProjet extends DolibarrModules
 		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
-		$this->conflictwith = array();
-		$this->langfiles = array('projects');
+		$this->conflictwith = array();
+		$this->langfiles = array('projects');
 
 		// Constants
 		$this->const = array();
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 853ad62ed0e..535971517e2 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
@@ -250,7 +250,7 @@ class modSociete extends DolibarrModules
 		$this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.address'=>"Address",'s.cp'=>"Zip",'s.ville'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.tel'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note'=>"Note",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus','d.nom'=>'State');
 		if (! empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix']='Prefix';
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.cp'=>"Text",'s.ville'=>"Text",'p.libelle'=>"List:c_pays:libelle:rowid",'p.code'=>"Text",'s.tel'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.cp'=>"Text",'s.ville'=>"Text",'p.libelle'=>"List:c_pays:libelle:rowid",'p.code'=>"Text",'s.tel'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.cp'=>"Text",'s.ville'=>"Text",'p.libelle'=>"List:c_pays:libelle:rowid",'p.code'=>"Text",'s.tel'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'Text');
 		$this->export_entities_array[$r]=array();	// We define here only fields that use another picto
         // Add extra fields
         $sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'company'";
diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 17da725a80d..5b611768119 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin       <regis@dolibarr.fr>
- * Copyright (C) 2010-2011 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
+/* Copyright (C) 2010-2012	Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2010-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,13 +50,10 @@
 	<td colspan="<?php echo $colspan; ?>">&nbsp;</td>
 </tr>
 
-<form name="addproduct" id="addproduct"
-	action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add"
-	method="POST">
-	<input type="hidden" name="token"
-		value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden"
-		name="action" value="addline" /> <input type="hidden" name="id"
-		value="<?php echo $this->id; ?>" />
+<form name="addproduct" id="addproduct"	action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
+<input type="hidden" name="action" value="addline" />
+<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
 
 	<tr <?php echo $bcnd[$var]; ?>>
 		<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
@@ -77,8 +74,9 @@
 			// Editor wysiwyg
 			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 			$nbrows=ROWS_2;
+			$enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
 			if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-			$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+			$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,70);
 			$doleditor->Create();
 			?>
 		</td>
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index a3dc4f412dc..601f463682d 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -78,7 +78,7 @@ jQuery(document).ready(function() {
 
 	if (is_object($hookmanager))
 	{
-        $parameters=array('fk_parent_line'=>$_POST["fk_parent_line"]);
+        $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
 	    $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
 	}
 
@@ -87,8 +87,9 @@ jQuery(document).ready(function() {
 	// Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $nbrows=ROWS_2;
+    $enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
     if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-    $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+    $doleditor=new DolEditor('np_desc',GETPOST('np_desc"'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,70);
 	$doleditor->Create();
 	?>
 	</td>
@@ -99,9 +100,9 @@ $colspan = 4;
 if (! empty($conf->margin->enabled)) {
 ?>
 	<td align="right">
-  <select id="fournprice" name="fournprice" style="display: none;"></select>
-  <input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
-  </td>
+		<select id="fournprice" name="fournprice" style="display: none;"></select>
+		<input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
+	</td>
 <?php
   if (! empty($conf->global->DISPLAY_MARGIN_RATES))
     $colspan++;
@@ -109,7 +110,9 @@ if (! empty($conf->margin->enabled)) {
     $colspan++;
 }
 ?>
-	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>" name="addline"></td>
+	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>">
+		<input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>" name="addline">
+	</td>
 </tr>
 
 <?php if (! empty($conf->service->enabled) && $dateSelector) {
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index ba796d174c4..d3cd793891d 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -1117,7 +1117,7 @@ else
                 print '<input type="hidden" name="action" value="setexpedition_method_id">';
                 $object->fetch_delivery_methods();
                 print $form->selectarray("expedition_method_id",$object->meths,$object->expedition_method_id,1,0,0,"",1);
-                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
                 print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
                 print '</form>';
             }
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index c3098c38a87..f44722d8de6 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -202,10 +202,9 @@ class Export
 	 *      @param      int		$indice				Indice of export
 	 *      @param      array	$array_selected     Filter on array of fields to export
 	 *      @param      array	$array_filterValue  Filter on array of fields to export
-	 *      @param      array	$array_filtered     Array with filters values
 	 *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
 	 */
-	function build_sql($indice, $array_selected, $array_filterValue, $array_filtered)
+	function build_sql($indice, $array_selected, $array_filterValue)
 	{
 		// Build the sql request
 		$sql=$this->array_export_sql_start[$indice];
@@ -225,16 +224,13 @@ class Export
 		$sql.=$this->array_export_sql_end[$indice];
 
 		//construction du filtrage si le parametrage existe
-		if (is_array($array_filtered))
+		if (is_array($array_filterValue))
 		{
 			$sqlWhere='';
 			// pour ne pas a gerer le nombre de condition
-			foreach ($array_filtered as $key => $value)
+			foreach ($array_filterValue as $key => $value)
 			{
-				if ($array_filterValue[$key])
-				{
-					$sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[0][$key], $key, $array_filterValue[$key]);
-				}
+				$sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[0][$key], $key, $array_filterValue[$key]);
 			}
 			$sql.=$sqlWhere;
 		}
@@ -297,8 +293,10 @@ class Export
 						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
 				}
 				break;
-			case 'Status':
 			case 'Boolean':
+				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+				break;
+			case 'Status':
 			case 'List':
 				if (is_numeric($ValueField))
 					$szFilterQuery=" ".$NameField."=".$ValueField;
@@ -339,8 +337,10 @@ class Export
 	{
 		$szFilterField='';
 		$InfoFieldList = explode(":", $TypeField);
+		
 		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0]) {
+		switch ($InfoFieldList[0]) 
+		{
 			case 'Text':
 			case 'Date':
 			case 'Duree':
@@ -348,18 +348,18 @@ class Export
 				$szFilterField='<input type="text" name='.$NameField." value='".$ValueField."'>";
 				break;
 			case 'Boolean':
-				$szFilterField="<select name=".$NameField.'" class="flat">';
+				$szFilterField='<select name="'.$NameField.'" class="flat">';
 				$szFilterField.='<option ';
 				if ($ValueField=='') $szFilterField.=' selected ';
 				$szFilterField.=' value="">&nbsp;</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='1') $szFilterField.=' selected ';
-				$szFilterField.=' value="1">'.yn(1).'</option>';
+				if ($ValueField=='yes') $szFilterField.=' selected ';
+				$szFilterField.=' value="yes">'.yn(1).'</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='0') $szFilterField.=' selected ';
-				$szFilterField.=' value="0">'.yn(0).'</option>';
+				if ($ValueField=='no') $szFilterField.=' selected ';
+				$szFilterField.=' value="no">'.yn(0).'</option>';
 				$szFilterField.="</select>";
 				break;
 			case 'List':
@@ -387,6 +387,13 @@ class Export
 						while ($i < $num)
 						{
 							$obj = $this->db->fetch_object($resql);
+							if ($obj->$InfoFieldList[2] == '-')	
+							{
+								// Discard entry '-'
+								$i++;
+								continue;
+							}
+															
 							$labeltoshow=dol_trunc($obj->$InfoFieldList[2],18);
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
@@ -401,7 +408,7 @@ class Export
 					}
 					$szFilterField.="</select>";
 
-					$this->db->close();
+					$this->db->free();
 				}
 				break;
 		}
@@ -457,11 +464,10 @@ class Export
 	 *      @param      string		$datatoexport       Name of dataset to export
 	 *      @param      array		$array_selected     Filter on array of fields to export
 	 *      @param      array		$array_filterValue  Filter on array of fields with a filter
-	 *      @param      array		$array_filtered     Values of filters
 	 *      @param		string		$sqlquery			If set, transmit a sql query instead of building it from arrays
 	 *      @return		int								<0 if KO, >0 if OK
 	 */
-	function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $array_filtered, $sqlquery = '')
+	function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
  	{
 		global $conf,$langs;
 
@@ -485,7 +491,7 @@ class Export
 		$objmodel = new $classname($this->db);
 
 		if (! empty($sqlquery)) $sql = $sqlquery;
-        else $sql=$this->build_sql($indice, $array_selected, $array_filterValue, $array_filtered);
+        else $sql=$this->build_sql($indice, $array_selected, $array_filterValue);
 
 		// Run the sql
 		$this->sqlusedforexport=$sql;
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 1a73d47dfc1..f96eb57d648 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -94,7 +94,7 @@ $entitytolang = array(
 );
 
 $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
-$array_filtered=isset($_SESSION["export_filtered_fields"])?$_SESSION["export_filtered_fields"]:array();
+//$array_filtered=isset($_SESSION["export_filtered_fields"])?$_SESSION["export_filtered_fields"]:array();
 $array_filtervalue=isset($_SESSION["export_FilterValue_fields"])?$_SESSION["export_FilterValue_fields"]:array();
 $datatoexport=GETPOST("datatoexport");
 $action=GETPOST('action', 'alpha');
@@ -116,8 +116,8 @@ $sqlusedforexport='';
 
 $upload_dir = $conf->export->dir_temp.'/'.$user->id;
 
-$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
-//$usefilters=1;
+//$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
+$usefilters=1;
 
 
 /*
@@ -189,53 +189,6 @@ if ($action=='unselectfield')
     }
 }
 
-/*
-if ($action=='selectFilterfield')
-{
-	if ($_GET["field"]=='all')
-	{
-		$fieldsarray=$objexport->array_export_TypeFields[0];
-		foreach($fieldsarray as $key=>$val)
-		{
-			if (! empty($array_filtered[$key])) continue;		// If already selected, select next
-			$array_filtered[$key]=count($array_filtered)+1;
-			//print_r($array_selected);
-			$_SESSION["export_filtered_fields"]=$array_filtered;
-		}
-	}
-	else
-	{
-		$array_filtered[$_GET["field"]]=count($array_filtered)+1;
-		//print_r($array_selected);
-		$_SESSION["export_filtered_fields"]=$array_filtered;
-	}
-}
-
-if ($action=='unselectFilterfield')
-{
-	if ($_GET["field"]=='all')
-	{
-		$array_filtered=array();
-		$_SESSION["export_filtered_fields"]=$array_filtered;
-	}
-	else
-	{
-		unset($array_filtered[$_GET["field"]]);
-		// Renumber fields of array_selected (from 1 to nb_elements)
-		asort($array_filtered);
-		$i=0;
-		$array_filterted_save=$array_filtered;
-		foreach($array_filtered as $code=>$value)
-		{
-			$i++;
-			$array_filtered[$code]=$i;
-			//print "x $code x $i y<br>";
-		}
-		$_SESSION["export_filtered_fields"]=$array_filtered;
-	}
-}
-*/
-
 if ($action=='downfield' || $action=='upfield')
 {
     $pos=$array_selected[$_GET["field"]];
@@ -263,7 +216,7 @@ if ($action=='downfield' || $action=='upfield')
 if ($step == 1 || $action == 'cleanselect')
 {
     $_SESSION["export_selected_fields"]=array();
-    $_SESSION["export_FilterValue_fields"]=array();
+    //$_SESSION["export_FilterValue_fields"]=array();
     $_SESSION["export_filtered_fields"]=array();
     $array_selected=array();
     $array_filtervalue=array();
@@ -273,7 +226,7 @@ if ($step == 1 || $action == 'cleanselect')
 if ($action == 'builddoc')
 {
     // Build export file
-	$result=$objexport->build_file($user, $_POST['model'], $datatoexport, $array_selected, $array_filtervalue, $array_filtered);
+	$result=$objexport->build_file($user, $_POST['model'], $datatoexport, $array_selected, $array_filtervalue);
 	if ($result < 0)
 	{
 	    $mesg='<div class="error">'.$objexport->error.'</div>';
@@ -360,7 +313,7 @@ if ($action == 'add_export_model')
 if ($step == 2 && $action == 'select_model')
 {
     $_SESSION["export_selected_fields"]=array();
-    $_SESSION["export_filtered_fields"]=array();
+    //$_SESSION["export_filtered_fields"]=array();
     $_SESSION["export_FilterValue_fields"]=array();
 
     $array_selected=array();
@@ -388,25 +341,34 @@ if ($step == 2 && $action == 'select_model')
 			$array_filtervalue[$val]=$fieldsarrayvalue[$i-1];
 			$i++;
 		}
-		$_SESSION["export_filtered_fields"]=$array_filtered;
+		//$_SESSION["export_filtered_fields"]=$array_filtered;
 		$_SESSION["export_FilterValue_fields"]=$array_filtervalue;
     }
 }
 
-// recuperation du filtrage issu du formulaire
+// Get form with filters
 if ($step == 4 && $action == 'submitFormField')
 {
 	// on boucle sur les champs selectionne pour recuperer la valeur
 	if (is_array($objexport->array_export_TypeFields[0]))
 	{
 		$_SESSION["export_FilterValue_fields"]=array();
-		foreach($array_filtered as $code=>$value)
+		var_dump($_POST);
+		foreach($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
 		{
-			//print $code."=".$_POST[$objexport->array_export_fields[0][$code]];
-			$objexport->array_export_FilterValue[0][$code] = (isset($objexport->array_export_fields[0][$code])?$_POST[$objexport->array_export_fields[0][$code]]:'');
+			$newcode=(string) preg_replace('/\./','_',$code);
+			//print 'xxx'.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
+			$filterqualified=1;
+			if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') $filterqualified=0;
+			elseif (preg_match('/^List/',$type) && $_POST[$newcode] <= 0) $filterqualified=0;
+			if ($filterqualified)
+			{	
+				//print 'Filter on '.$newcode.' type='.$type.' value='.$_POST[$newcode]."\n";
+				$objexport->array_export_FilterValue[0][$code] = $_POST[$newcode];
+			}
 		}
-		$_SESSION["export_FilterValue_fields"]=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
 		$array_filtervalue=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
+		$_SESSION["export_FilterValue_fields"]=$array_filtervalue;
 	}
 }
 
@@ -415,7 +377,6 @@ if ($step == 4 && $action == 'submitFormField')
  * View
  */
 
-
 if ($step == 1 || ! $datatoexport)
 {
     llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
@@ -566,7 +527,7 @@ if ($step == 2 && $datatoexport)
     // Champs exportables
     $fieldsarray=$objexport->array_export_fields[0];
     // Select request if all fields are selected
-    $sqlmaxforexport=$objexport->build_sql(0, array(), array(), array());
+    $sqlmaxforexport=$objexport->build_sql(0, array(), array());
 
 	//    $this->array_export_module[0]=$module;
 	//    $this->array_export_code[0]=$module->export_code[$r];
@@ -741,7 +702,7 @@ if ($step == 3 && $datatoexport)
 	// valeur des filtres
 	$ValueFiltersarray=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
 	// Select request if all fields are selected
-	$sqlmaxforexport=$objexport->build_sql(0, array(), array(), array());
+	$sqlmaxforexport=$objexport->build_sql(0, array(), array());
 
 	$var=true;
 	$i = 0;
@@ -767,6 +728,7 @@ if ($step == 3 && $datatoexport)
 		print img_object('',$entityicon).' '.$langs->trans($entitylang);
 		print '</td>';
 
+		// Field name
 		$labelName=(! empty($fieldsarray[$code])?$fieldsarray[$code]:'');
 		$ValueFilter=(! empty($array_filtervalue[$code])?$array_filtervalue[$code]:'');
 		$text=$langs->trans($labelName);
@@ -777,11 +739,13 @@ if ($step == 3 && $datatoexport)
 		print '<td>';
 		print $form->textwithpicto($text,$htmltext);
 		print '</td>';
+		
+		// Filter value
 		print '<td>';
 		if (! empty($Typefieldsarray[$code]))
 		{
 			$szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]);
-			if ($szInfoFiltre)
+			if ($szInfoFiltre)	// Is there an info help for this filter ?
 			{
 				$tmp=$objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 				print $form->textwithpicto($tmp, $szInfoFiltre);
@@ -865,7 +829,7 @@ if ($step == 4 && $datatoexport)
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
-    // Nbre champs exportes
+    // List of exported fields
     print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>';
     $list='';
     foreach($array_selected as $code=>$value)
@@ -873,28 +837,31 @@ if ($step == 4 && $datatoexport)
         $list.=($list?', ':'');
         $list.=$langs->trans($objexport->array_export_fields[0][$code]);
     }
-    print '<td>'.$list.'</td></tr>';
+    print '<td>'.$list.'</td>';
+    print '</tr>';
 
-    // Number of filtered fields
+    // List of filtered fiels
     if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
     	print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
     	$list='';
-    	foreach($array_filtered as $code=>$value)
+    	foreach($array_filtervalue as $code=>$value)
     	{
-    		if (isset($objexport->array_export_fields[0][$code])) {
+    		if (isset($objexport->array_export_fields[0][$code])) 
+    		{
     			$list.=($list?', ':'');
-    			$list.="[".$langs->trans($objexport->array_export_fields[0][$code])."]='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    			$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
     		}
     	}
-    	print '<td>'.$list.'</td></tr>';
+    	print '<td>'.($list?$list:$langs->trans("None")).'</td>';
+    	print '</tr>';
     }
 
     print '</table>';
     print '<br>';
 
     // Select request if all fields are selected
-    $sqlmaxforexport=$objexport->build_sql(0, array(), array(), array());
+    $sqlmaxforexport=$objexport->build_sql(0, array(), array());
 
     print $langs->trans("ChooseFieldsOrdersAndTitle").'<br>';
 
@@ -1095,7 +1062,7 @@ if ($step == 5 && $datatoexport)
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
-    // Nbre champs exportes
+    // List of exported fields
     print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>';
     $list='';
     foreach($array_selected as $code=>$label)
@@ -1105,19 +1072,21 @@ if ($step == 5 && $datatoexport)
     }
     print '<td>'.$list.'</td></tr>';
 
-    // Nbre champs filtres
-    if (is_array($objexport->array_export_TypeFields[0]))
+    // List of filtered fiels
+    if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
     	print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
     	$list='';
-    	foreach($array_filtered as $code=>$value)
+    	foreach($array_filtervalue as $code=>$value)
     	{
-    		if (isset($objexport->array_export_fields[0][$code])) {
+    		if (isset($objexport->array_export_fields[0][$code])) 
+    		{
     			$list.=($list?', ':'');
-    			$list.="[".$langs->trans($objexport->array_export_fields[0][$code])."]='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    			$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
     		}
     	}
-    	print '<td>'.$list.'</td></tr>';
+    	print '<td>'.($list?$list:$langs->trans("None")).'</td>';
+    	print '</tr>';
     }
 
     print '</table>';
@@ -1179,10 +1148,10 @@ if ($step == 5 && $datatoexport)
 print '<br>';
 
 
-$db->close();
-
 llxFooter();
 
+$db->close();
+
 
 /**
  * 	Return table name of an alias. For this, we look for the "tablename as alias" in sql string.
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 81390c9f0b0..1fe9810414f 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -380,13 +380,13 @@ class Holiday extends CommonObject
 
                 $tab_result[$i]['rowid'] = $obj->rowid;
                 $tab_result[$i]['fk_user'] = $obj->fk_user;
-                $tab_result[$i]['date_create'] = $obj->date_create;
+                $tab_result[$i]['date_create'] = $this->db->jdate($obj->date_create);
                 $tab_result[$i]['description'] = $obj->description;
-                $tab_result[$i]['date_debut'] = $obj->date_debut;
-                $tab_result[$i]['date_fin'] = $obj->date_fin;
+                $tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
+                $tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
                 $tab_result[$i]['statut'] = $obj->statut;
                 $tab_result[$i]['fk_validator'] = $obj->fk_validator;
-                $tab_result[$i]['date_valid'] = $obj->date_valid;
+                $tab_result[$i]['date_valid'] = $this->db->jdate($obj->date_valid);
                 $tab_result[$i]['fk_user_valid'] = $obj->fk_user_valid;
                 $tab_result[$i]['date_refuse'] = $obj->date_refuse;
                 $tab_result[$i]['fk_user_refuse'] = $obj->fk_user_refuse;
@@ -1591,27 +1591,27 @@ class Holiday extends CommonObject
       		}
     }
 
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    function initAsSpecimen()
-    {
-    	global $user,$langs;
-    
-    	// Initialise parameters
-    	$this->id=0;
+    /**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
+     */
+    function initAsSpecimen()
+    {
+    	global $user,$langs;
+    
+    	// Initialise parameters
+    	$this->id=0;
     	$this->specimen=1;
     	
-    	$this->fk_user=1;
-    	$this->description='SPECIMEN description';
-    	$this->date_debut=dol_now();
-    	$this->date_fin=dol_now()+(24*3600);
+    	$this->fk_user=1;
+    	$this->description='SPECIMEN description';
+    	$this->date_debut=dol_now();
+    	$this->date_fin=dol_now()+(24*3600);
     	$this->fk_validator=1;
-    }
+    }
     
 }
 ?>
diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php
index 43dba92b726..859069957a6 100644
--- a/htdocs/holiday/fiche.php
+++ b/htdocs/holiday/fiche.php
@@ -563,12 +563,11 @@ if ($action == 'confirm_cancel' && $_GET['confirm'] == 'yes')
 
 
 
-/***************************************************
+/*
  * View
-****************************************************/
+ */
 
-$form = new Form($db);
-
+$form = new Form($db);
 
 llxHeader(array(),$langs->trans('CPTitreMenu'));
 
@@ -753,35 +752,36 @@ else
             //print_fiche_titre($langs->trans('TitreRequestCP'));
 
             // Si il y a une erreur
-            if (GETPOST('error')) {
-
-                switch(GETPOST('error')) {
+            if (GETPOST('error')) 
+            {
+                switch(GETPOST('error')) 
+                {
                     case 'datefin' :
-                        $errors[] = $langs->trans('ErrorEndDateCP');
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
                         break;
                     case 'SQL_Create' :
-                        $errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
                         break;
                     case 'CantCreate' :
-                        $errors[] = $langs->trans('CantCreateCP');
+                        $errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
                         break;
                     case 'Valideur' :
-                        $errors[] = $langs->trans('InvalidValidatorCP');
+                        $errors[] = $langs->transnoentitiesnoconv('InvalidValidatorCP');
                         break;
                     case 'nodatedebut' :
-                        $errors[] = $langs->trans('NoDateDebut');
+                        $errors[] = $langs->transnoentitiesnoconv('NoDateDebut');
                         break;
                     case 'nodatedebut' :
-                        $errors[] = $langs->trans('NoDateFin');
+                        $errors[] = $langs->transnoentitiesnoconv('NoDateFin');
                         break;
                     case 'DureeHoliday' :
-                        $errors[] = $langs->trans('ErrorDureeCP');
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorDureeCP');
                         break;
                     case 'NoMotifRefuse' :
-                        $errors[] = $langs->trans('NoMotifRefuseCP');
+                        $errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
                         break;
                     case 'mail' :
-                        $errors[] = $langs->trans('ErrorMailNotSend').'<br /><b>'.$_GET['error_content'].'</b>';
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
                         break;
                 }
 
@@ -795,7 +795,7 @@ else
                 if ($action == 'delete' && $cp->statut == 1) {
                     if($user->rights->holiday->delete)
                     {
-                        $ret=$form->form_confirm("fiche.php?id=".$_GET['id'],$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
+                        $ret=$form->form_confirm("fiche.php?id=".$id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
                         if ($ret == 'html') print '<br />';
                     }
                 }
@@ -803,14 +803,14 @@ else
                 // Si envoi en validation
                 if ($action == 'sendToValidate' && $cp->statut == 1 && $userID == $cp->fk_user)
                 {
-                    $ret=$form->form_confirm("fiche.php?id=".$_GET['id'],$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 0, 1);
+                    $ret=$form->form_confirm("fiche.php?id=".$id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
                     if ($ret == 'html') print '<br />';
                 }
 
                 // Si validation de la demande
                 if ($action == 'valid' && $cp->statut == 2 && $userID == $cp->fk_validator)
                 {
-                    $ret=$form->form_confirm("fiche.php?id=".$_GET['id'],$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 0, 1);
+                    $ret=$form->form_confirm("fiche.php?id=".$id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
                     if ($ret == 'html') print '<br />';
                 }
 
@@ -818,19 +818,28 @@ else
                 if ($action == 'refuse' && $cp->statut == 2 && $userID == $cp->fk_validator)
                 {
                     $array_input = array(array('type'=>"text",'label'=>"Entrez ci-dessous un motif de refus :",'name'=>"detail_refuse",'size'=>"50",'value'=>""));
-                    $ret=$form->form_confirm("fiche.php?id=".$_GET['id']."&action=confirm_refuse",$langs->trans("TitleRefuseCP"),"","confirm_refuse",$array_input,"",0);
+                    $ret=$form->form_confirm("fiche.php?id=".$id."&action=confirm_refuse",$langs->trans("TitleRefuseCP"),"","confirm_refuse", $array_input, 1 ,0);
                     if ($ret == 'html') print '<br />';
                 }
 
                 // Si annulation de la demande
                 if ($action == 'cancel' && $cp->statut == 2 && $userID == $cp->fk_validator)
                 {
-                    $ret=$form->form_confirm("fiche.php?id=".$_GET['id'],$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 0, 1);
+                    $ret=$form->form_confirm("fiche.php?id=".$id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
                     if ($ret == 'html') print '<br />';
                 }
 
 
-                dol_fiche_head(array(),'card',$langs->trans("CPTitreMenu"),0,'holiday');
+                $h=0;
+                $head = array();
+                $head[$h][0] = DOL_URL_ROOT . '/holiday/fiche.php?id='.$id;
+                $head[$h][1] = $langs->trans("Card");
+                $head[$h][2] = 'card';
+                $h++;
+                
+                complete_head_from_modules($conf,$langs,$cp,$head,$h,'holiday');
+                
+                dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
 
 
                 if ($action == 'edit' && $user->id == $cp->fk_user && $cp->statut == 1)
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index 1c27e2978bf..dd706ed9be2 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -26,6 +26,7 @@
 require('../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
@@ -56,6 +57,7 @@ $search_employe  = GETPOST('search_employe');
 $search_valideur = GETPOST('search_valideur');
 $search_statut   = GETPOST('select_statut');
 
+$holiday = new Holiday($db);
 
 /*
  * Actions
@@ -146,12 +148,10 @@ $user_id = $user->id;
 // Récupération des congés payés de l'utilisateur ou de tous les users
 if(!$user->rights->holiday->lire_tous)
 {
-    $holiday = new Holiday($db);
     $holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);
 }
 else
 {
-    $holiday = new Holiday($db);
     $holiday_payes = $holiday->fetchAll($order,$filter);
 }
 
@@ -281,21 +281,20 @@ if (! empty($holiday->holiday))
 		$validator = new User($db);
 		$validator->fetch($infos_CP['fk_validator']);
 
-		$date = date_create($infos_CP['date_create']);
-		$date = date_format($date,'Y-m-d');
+		$date = $infos_CP['date_create'];
 
 		$statut = $holiday->getStatutCP($infos_CP['statut']);
 
 		print '<tr '.$bc[$var].'>';
 		print '<td><a href="./fiche.php?id='.$infos_CP['rowid'].'">CP '.$infos_CP['rowid'].'</a></td>';
-		print '<td style="text-align: center;">'.$date.'</td>';
+		print '<td style="text-align: center;">'.dol_print_date($date,'day').'</td>';
 		print '<td>'.$user->getNomUrl('1').'</td>';
 		print '<td>'.$validator->getNomUrl('1').'</td>';
 		print '<td style="text-align: center;">'.$infos_CP['date_debut'].'</td>';
 		print '<td style="text-align: center;">'.$infos_CP['date_fin'].'</td>';
 		print '<td>';
 		$nbopenedday=num_open_day($infos_CP['date_debut'],$infos_CP['date_fin'],0,1);
-		print $nbopenedday.' '.$langs->trans('Jours');
+		print $nbopenedday;
 		print '<td align="center"><a href="./fiche.php?id='.$infos_CP['rowid'].'">'.$statut.'</a></td>';
 		print '</tr>'."\n";
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index f581375463b..b581a3b5bfd 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -26,6 +26,7 @@ require('../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 
 // Protection if external user
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 4731b29d956..5c212a87ea6 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -87,7 +87,7 @@ foreach($cp->logs as $logs_CP)
 if($log_holiday == '2')
 {
     print '<tr>';
-    print '<td colspan="7" class="pair" style="text-align: center; padding: 5px;">'.$langs->trans('NoResult').'</td>';
+    print '<td colspan="7" class="pair" style="text-align: center; padding: 5px;">'.$langs->trans('NoResults').'</td>';
     print '</tr>';
 }
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index c942bd23efe..8b90a1178c6 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1498,7 +1498,7 @@ if ($step == 6 && $datatoimport)
 	// Source file format
 	print '<tr><td width="25%">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text=$objmodelimport->getDriverDesc($format);
+    $text=$objmodelimport->getDriverDescForKey($format);
     print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text);
 	print '</td></tr>';
 
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 0d7a76067d1..56fe19f37eb 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
@@ -52,6 +52,12 @@ $db_pass=GETPOST('db_pass');
 $db_port=GETPOST('db_port','int');
 $db_prefix=GETPOST('db_prefix','alpha');
 
+session_start();	// To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
+
+// Save a flag to tell to restore input value if we do back
+$_SESSION['dol_save_pass']=$db_pass;
+//$_SESSION['dol_save_passroot']=$passroot;
+
 // Now we load forced value from install.forced.php file.
 $useforcedwizard=false;
 $forcedfile="./install.forced.php";
@@ -244,24 +250,24 @@ if (! $error && $db->connected)
     }
 }
 
-// Define $defaultCharacterSet and $defaultCollationConnection
+// Define $defaultCharacterSet and $defaultDBSortingCollation
 if (! $error && $db->connected)
 {
     if (! empty($_POST["db_create_database"]))	// If we create database, we force default value
     {
     	$defaultCharacterSet=getStaticMember(get_class($db),'forcecharset');
-    	$defaultCollationConnection=getStaticMember(get_class($db),'forcecollate');
+    	$defaultDBSortingCollation=getStaticMember(get_class($db),'forcecollate');
     }
     else	// If already created, we take current value
     {
         $defaultCharacterSet=$db->getDefaultCharacterSetDatabase();
-        $defaultCollationConnection=$db->getDefaultCollationDatabase();
+        $defaultDBSortingCollation=$db->getDefaultCollationDatabase();
     }
 
     print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
-    print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultCollationConnection.'">';
+    print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
     $db_character_set=$defaultCharacterSet;
-    $db_collation=$defaultCollationConnection;
+    $db_collation=$defaultDBSortingCollation;
 }
 
 
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 2ba95dec92e..4cb44467761 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -69,6 +69,8 @@ if (@file_exists($forcedfile)) {
  *	View
  */
 
+session_start();	// To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
+
 pHeader($langs->trans("ConfigurationFile"),"etape1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'));
 
 // Test if we can run a first install process
@@ -407,7 +409,8 @@ if (! empty($force_install_message))
 		<td class="label" valign="top"><input type="text" id="db_pass" autocomplete="off"
 			name="db_pass"
 			value="<?php
-			$autofill=((! empty($dolibarr_main_db_pass))?$dolibarr_main_db_pass:$force_install_databasepass);
+			//$autofill=((! empty($dolibarr_main_db_pass))?$dolibarr_main_db_pass:$force_install_databasepass);
+			$autofill=((! empty($_SESSION['dol_save_pass']))?$_SESSION['dol_save_pass']:$force_install_databasepass);
 			if (! empty($dolibarr_main_prod)) $autofill='';
 			print dol_escape_htmltag($autofill);
 			?>"></td>
@@ -438,7 +441,7 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite hideroot">
-		<td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td>
+		<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b></td>
 		<td class="label" valign="top"><input type="text" id="db_user_root"
 			name="db_user_root" class="needroot"
 			value="<?php print (! empty($db_user_root))?$db_user_root:$force_install_databaserootlogin; ?>"></td>
@@ -455,7 +458,7 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite hideroot">
-		<td class="label" valign="top"><?php echo $langs->trans("Password"); ?>
+		<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
 		</td>
 		<td class="label" valign="top"><input type="text" autocomplete="off"
 			id="db_pass_root" name="db_pass_root" class="needroot"
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index 1a1cc16f3f3..db3968df5d6 100755
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -804,3 +804,5 @@ ALTER TABLE llx_c_typent DROP INDEX code, ADD UNIQUE uk_c_typent (code);
 ALTER TABLE llx_c_effectif DROP INDEX code, ADD UNIQUE uk_c_effectif (code);
 ALTER TABLE llx_c_paiement DROP INDEX code, ADD UNIQUE uk_c_paiement (code);
 
+-- increase field size
+ALTER TABLE llx_bank_account MODIFY COLUMN code_banque varchar(8);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 24767819c65..899adc7d5f6 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -1,7 +1,7 @@
 -- =============================================================================
 -- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+-- Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,41 +23,34 @@
 
 create table llx_bank_account
 (
-  rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  datec          datetime,
-  tms            timestamp,
-  ref            varchar(12) NOT NULL,
-  label          varchar(30) NOT NULL,
-  entity         integer DEFAULT 1 NOT NULL,	-- multi company id
-  bank           varchar(60),
-  code_banque    varchar(7),
-  code_guichet   varchar(6),
-  number         varchar(255),
-  cle_rib        varchar(5),
-  bic            varchar(11),
-  iban_prefix    varchar(34),                 -- 34 according to ISO 13616
-  country_iban   varchar(2),				-- deprecated
-  cle_iban       varchar(2),
-  domiciliation  varchar(255),
-  fk_departement integer        DEFAULT NULL,
-  fk_pays        integer        NOT NULL,
-  proprio        varchar(60),
-  adresse_proprio varchar(255),
-  courant        smallint DEFAULT 0 NOT NULL,
-  clos           smallint DEFAULT 0 NOT NULL,
-  rappro         smallint DEFAULT 1,
-  url			       varchar(128),
-  account_number varchar(8),
-  currency_code  varchar(3) NOT NULL,
-  min_allowed    integer DEFAULT 0,
-  min_desired    integer DEFAULT 0,
-  comment        text
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  datec				datetime,
+  tms				timestamp,
+  ref				varchar(12) NOT NULL,
+  label				varchar(30) NOT NULL,
+  entity			integer DEFAULT 1 NOT NULL,	-- multi company id
+  bank				varchar(60),
+  code_banque		varchar(8),
+  code_guichet		varchar(6),
+  number			varchar(255),
+  cle_rib			varchar(5),
+  bic				varchar(11),
+  iban_prefix		varchar(34),				-- 34 according to ISO 13616
+  country_iban		varchar(2),					-- deprecated
+  cle_iban			varchar(2),
+  domiciliation		varchar(255),
+  fk_departement	integer        DEFAULT NULL,
+  fk_pays			integer        NOT NULL,
+  proprio			varchar(60),
+  adresse_proprio	varchar(255),
+  courant			smallint DEFAULT 0 NOT NULL,
+  clos				smallint DEFAULT 0 NOT NULL,
+  rappro			smallint DEFAULT 1,
+  url				varchar(128),
+  account_number	varchar(8),
+  currency_code		varchar(3) NOT NULL,
+  min_allowed		integer DEFAULT 0,
+  min_desired		integer DEFAULT 0,
+  comment			text
+  
 )ENGINE=innodb;
-
--- 
--- List of codes for the field entity
---
--- 1 : first company bank account
--- 2 : second company bank account
--- 3 : etc...
---
\ No newline at end of file
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index e5673fd9232..57d561e631d 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -123,8 +123,8 @@ YouMustCreateItAndAllowServerToWrite=يجب إنشاء هذا الدليل ، و
 CharsetChoice=اختيار مجموعة حروف
 CharacterSetClient=مجموعة الحروف المستخدمة في توليدها صفحات هتمل
 CharacterSetClientComment=اختيار الطابع المحدد لعرضها على الإنترنت. <br/> واقترحت مجموعة الطابع الافتراضي هو واحد من قاعدة البيانات.
-CollationConnection=طابع الفرز بغية
-CollationConnectionComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
+DBSortingCollation=طابع الفرز بغية
+DBSortingCollationComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 CharacterSetDatabase=الطابع المحدد لقاعدة البيانات
 CharacterSetDatabaseComment=اختيار مجموعة حروف تريد لإنشاء قاعدة بيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع المستخدم أذونات <b>٪ ق.</b>
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 7462b72ccb9..aa18691f409 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -132,8 +132,8 @@ YouMustCreateItAndAllowServerToWrite=Трябва да създадете таз
 CharsetChoice=Избор на знаците
 CharacterSetClient=Набор от символи, използвани за генерираните HTML уеб страници
 CharacterSetClientComment=Изберете набор от знаци за уеб дисплей. <br/> Default предлагания набор от символи е един от вашата база данни.
-CollationConnection=За символи сортиране
-CollationConnectionComment=Изберете кода на страницата, която определя подреждане характер, използван от база данни. Този параметър се нарича &quot;съпоставяне&quot; от някои бази данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
+DBSortingCollation=За символи сортиране
+DBSortingCollationComment=Изберете кода на страницата, която определя подреждане характер, използван от база данни. Този параметър се нарича &quot;съпоставяне&quot; от някои бази данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
 CharacterSetDatabase=Набор от знаци за база данни
 CharacterSetDatabaseComment=Изберете набор от символи, издирван за създаването на базата данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Ви помолим да създадете база данни <b>%s,</b> но за това, Dolibarr трябва да се свържете на сървъра <b>%s</b> с супер потребителски разрешения <b>%s.</b>
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index aabee817076..c9630609526 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -3,6 +3,7 @@ CHARSET=UTF-8
 BoxLastRssInfos=Fils d'informació RSS
 BoxLastProducts=Els %s últims productes/serveis
 BoxLastProductsInContract=Els %s últims productes/serveis contractats
+BoxProductsAlertStock=Productes en alerta d'estoc
 BoxLastSupplierBills=Últimes factures de proveïdors
 BoxLastCustomerBills=Últimes factures a clients
 BoxOldestUnpaidCustomerBills=Factures a clients més antigues pendents de pagament
@@ -25,6 +26,7 @@ BoxTitleLastBooks=Els %s darrers marcadors registrats
 BoxTitleNbOfCustomers=Nombre de clients
 BoxTitleLastRssInfos=Les %s últimes infos de %s
 BoxTitleLastProducts=Els %s darrers productes/serveis registrats
+BoxTitleProductsAlertStock=Productes en alerta d'estoc
 BoxTitleLastCustomerOrders=Les %s darreres comandes de clients modificades
 BoxTitleLastSuppliers=Els %s darrers proveïdors registrats
 BoxTitleLastCustomers=Els %s darrers clients registrats
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index f27d6e24039..b37e2c114c5 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -125,8 +125,8 @@ YouMustCreateItAndAllowServerToWrite=Cal crear aquest expedient i permetre al se
 CharsetChoice=Elecció del joc de caràcters
 CharacterSetClient=Codificació utilitzada per a la visualització de les pàgines
 CharacterSetClientComment=Pot triar la codificació que voleu per a la visualització de les pàgines.<br/>La codificació proposada per defecte és la de la seva base de dades.
-CollationConnection=Ordre de selecció utilitzat per la base de dades
-CollationConnectionComment=Pot triar la pàgina de codi per la qual es defineix l'ordre de selecció dels caràcters utilitzat per la base de dades. Aquest paràmetre també és anomenat 'confrontació' per algunes bases de dades.</br>Aquest paràmetre no és seleccionable si la base de dades ja està creada
+DBSortingCollation=Ordre de selecció utilitzat per la base de dades
+DBSortingCollationComment=Pot triar la pàgina de codi per la qual es defineix l'ordre de selecció dels caràcters utilitzat per la base de dades. Aquest paràmetre també és anomenat 'confrontació' per algunes bases de dades.</br>Aquest paràmetre no és seleccionable si la base de dades ja està creada
 CharacterSetDatabase=Codificació utilitzada per la base de dades
 CharacterSetDatabaseComment=Pot triar la codificació que voleu en la creació de la base de dades.</br>Aquest paràmetre no és seleccionable si la base de dades ja està creada
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Ha vollgut crear la base de dades <b>%s</b>, però per a això Dolibarr ha de connectar amb el servidor <b>%s</b> via el superusuari <b>%s</b>.
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index 39391c84b32..8bd455e6cee 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -124,8 +124,8 @@ YouMustCreateItAndAllowServerToWrite=Du skal oprette denne mappe og giver muligh
 CharsetChoice=Tegnsæt valg
 CharacterSetClient=Tegnsæt anvendes til genererede HTML-websider
 CharacterSetClientComment=Vælg tegnsættet for web displayet. <br/> Default foreslåede tegnsæt er den ene af din database.
-CollationConnection=Tegn sortering orden
-CollationConnectionComment=Vælg side kode, der definerer karakter's sortering rækkefølge anvendes af databasen. Denne parameter kaldes også »samling« af nogle databaser. <br/> Denne parameter kan ikke defineres, hvis database findes allerede.
+DBSortingCollation=Tegn sortering orden
+DBSortingCollationComment=Vælg side kode, der definerer karakter's sortering rækkefølge anvendes af databasen. Denne parameter kaldes også »samling« af nogle databaser. <br/> Denne parameter kan ikke defineres, hvis database findes allerede.
 CharacterSetDatabase=Tegnsæt for database
 CharacterSetDatabaseComment=Vælg tegnsættet ønskede for database oprettelse. <br/> Denne parameter kan ikke defineres, hvis database findes allerede.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Du beder om at oprette <b>databasen %s,</b> men for dette, Dolibarr behovet for at oprette forbindelse til <b>serveren %s</b> med <b>superbruger %s</b> tilladelser.
diff --git a/htdocs/langs/de_AT/install.lang b/htdocs/langs/de_AT/install.lang
index 451f0a15ab8..765d366a219 100644
--- a/htdocs/langs/de_AT/install.lang
+++ b/htdocs/langs/de_AT/install.lang
@@ -119,8 +119,8 @@ YouMustCreateItAndAllowServerToWrite=Bitte erstellen Sie dieses Verzeichnis und
 CharsetChoice=Zeichensatzauswahl
 CharacterSetClient=Zeichensatz für die generierten HTML-Seiten
 CharacterSetClientComment=Wählen Sie den gewünschten Zeichensatz für die Anzeige im Web.<br/>Standardmäßig empfiehlt sich jener Ihrer Datenbank.
-CollationConnection=Reihenfolge der Zeichensortierung (Collation)
-CollationConnectionComment=Wählen Sie den page-code zur Definition der Sortierreihenfolge für Zeichen in der Datenbank. Dieser Parameter wird von einigen Datenbanken auch als "Collation" bezeichnet.<br/>Dieser Wert kann nicht festgelegt werden, wenn die Datenbank bereits existiert.
+DBSortingCollation=Reihenfolge der Zeichensortierung (Collation)
+DBSortingCollationComment=Wählen Sie den page-code zur Definition der Sortierreihenfolge für Zeichen in der Datenbank. Dieser Parameter wird von einigen Datenbanken auch als "Collation" bezeichnet.<br/>Dieser Wert kann nicht festgelegt werden, wenn die Datenbank bereits existiert.
 CharacterSetDatabase=Datenbankzeichensatz
 CharacterSetDatabaseComment=Wählen Sie den Zeichensatz für die anzulegende Datenbank.<br/>Dieser Wert kann nicht festgelegt werden, wenn die Datenbank bereits existiert.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Sie möchten die Datenbank <b>%s</b> erstellen. Hierfür benötigt dolibarr eine Verbindung zum Server <b>%s</b> mit den Berechtigungen des Super-Users %s.
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 56e403a40ee..f7e0ae7654d 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -130,8 +130,8 @@ YouMustCreateItAndAllowServerToWrite=Bitte erstellen Sie dieses Verzeichnis und
 CharsetChoice=Zeichensatzauswahl
 CharacterSetClient=Zeichensatz für die generierten HTML-Seiten
 CharacterSetClientComment=Wählen Sie den gewünschten Zeichensatz für die Anzeige im Web.<br/>Standardmäßig empfiehlt sich jener Ihrer Datenbank.
-CollationConnection=Reihenfolge der Zeichensortierung 
-CollationConnectionComment=Wählen Sie den page-code zur Definition der Sortierreihenfolge für Zeichen in der Datenbank. Dieser Parameter wird von einigen Datenbanken auch als "Collation" bezeichnet.<br/>Dieser Wert kann nicht festgelegt werden, wenn die Datenbank bereits existiert.
+DBSortingCollation=Reihenfolge der Zeichensortierung 
+DBSortingCollationComment=Wählen Sie den page-code zur Definition der Sortierreihenfolge für Zeichen in der Datenbank. Dieser Parameter wird von einigen Datenbanken auch als "Collation" bezeichnet.<br/>Dieser Wert kann nicht festgelegt werden, wenn die Datenbank bereits existiert.
 CharacterSetDatabase=Datenbankzeichensatz
 CharacterSetDatabaseComment=Wählen Sie den Zeichensatz für die anzulegende Datenbank.<br/>Dieser Wert kann nicht festgelegt werden, wenn die Datenbank bereits existiert.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Sie möchten die Datenbank <b>%s</b> erstellen. Hierfür benötigt dolibarr eine Verbindung zum Server <b>%s</b> mit den Berechtigungen des Super-Users %s.
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index bb68fd90a20..77b706254bc 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -119,8 +119,8 @@ YouMustCreateItAndAllowServerToWrite=You must create this directory and allow fo
 CharsetChoice=Character set choice
 CharacterSetClient=Character set used for generated HTML web pages
 CharacterSetClientComment=Choose character set for web display.<br/> Default proposed character set is the one of your database.
-CollationConnection=Character sorting order
-CollationConnectionComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/>This parameter can't be defined if database already exists.
+DBSortingCollation=Character sorting order
+DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/>This parameter can't be defined if database already exists.
 CharacterSetDatabase=Character set for database
 CharacterSetDatabaseComment=Choose character set wanted for database creation.<br/>This parameter can't be defined if database already exists.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 78a9efcc083..2f252d39923 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -20,7 +20,6 @@ AddThisArticle=Add this article
 RestartSelling=Go back on sell
 SellFinished=Sell finished
 PrintTicket=Print ticket
-NoResults=No results
 NoProductFound=No article found
 ProductFound=product found
 ProductsFound=products found
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index da2623028fa..f111bfad1d6 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -124,8 +124,8 @@ YouMustCreateItAndAllowServerToWrite=You must create this directory and allow fo
 CharsetChoice=Character set choice
 CharacterSetClient=Character set used for generated HTML web pages
 CharacterSetClientComment=Choose character set for web display.<br/> Default proposed character set is the one of your database.
-CollationConnection=Character sorting order
-CollationConnectionComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/>This parameter can't be defined if database already exists.
+DBSortingCollation=Character sorting order
+DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/>This parameter can't be defined if database already exists.
 CharacterSetDatabase=Character set for database
 CharacterSetDatabaseComment=Choose character set wanted for database creation.<br/>This parameter can't be defined if database already exists.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 36866d73a8a..088e5076733 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -627,6 +627,7 @@ BySalesRepresentative=By sales representative
 LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
+NoResults=No results
 
 # Week day
 Monday=Monday
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 948d023efcf..72c4363ebe5 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -3,6 +3,7 @@ CHARSET=UTF-8
 BoxLastRssInfos=Hilos de información RSS
 BoxLastProducts=Los %s últimos productos/servicios
 BoxLastProductsInContract=Los %s últimos productos/servicios contratados
+BoxProductsAlertStock=Productos en alerta de stock
 BoxLastSupplierBills=Últimas facturas de proveedores
 BoxLastCustomerBills=Últimas facturas a clientes
 BoxOldestUnpaidCustomerBills=Facturas a clientes más antiguas pendientes de pago
@@ -25,6 +26,7 @@ BoxTitleLastBooks=Los %s últimos marcadores registrados
 BoxTitleNbOfCustomers=Número de clientes
 BoxTitleLastRssInfos=Las %s últimas infos de %s
 BoxTitleLastProducts=Los %s últimos productos/servicios registrados
+BoxTitleProductsAlertStock=Productos en alerta de stock
 BoxTitleLastCustomerOrders=Los %s últimos pedidos de clientes modificados
 BoxTitleLastSuppliers=Los %s últimos proveedores registrados
 BoxTitleLastCustomers=Los %s últimos clientes registrados
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index 700fdf4d022..a4e15bfe9d2 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -125,8 +125,8 @@ YouMustCreateItAndAllowServerToWrite=Debe crear este directorio y permitir al se
 CharsetChoice=Elección del juego de caracteres
 CharacterSetClient=Codificación utilizada para la visualización de las páginas
 CharacterSetClientComment=Puede elegir la codificación que desea para la visualización de las páginas.<br/>La codificación propuesta por defecto es la de su base de datos.
-CollationConnection=Orden de selección utilizado para la base de datos
-CollationConnectionComment=Puede elegir la página de código por la que se define el orden de selección de los caracteres utilizado por la base de datos. Este parámetro también es llamado 'cotejo' por algunas bases de datos.<br/> Este parámetro no es seleccionable si la base de datos ya está creada
+DBSortingCollation=Orden de selección utilizado para la base de datos
+DBSortingCollationComment=Puede elegir la página de código por la que se define el orden de selección de los caracteres utilizado por la base de datos. Este parámetro también es llamado 'cotejo' por algunas bases de datos.<br/> Este parámetro no es seleccionable si la base de datos ya está creada
 CharacterSetDatabase=Codificación utilizada por la base de datos
 CharacterSetDatabaseComment=Puede elegir la codificación que desea en la creación de la base de datos.<br/> Este parámetro no es seleccionable si la base de datos ya está creada
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Quiso crear la base de datos <b>%s</b>, pero para ello Dolibarr debe conectarse con el servidor <b>%s</b> vía el superusuario <b>%s</b>.
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index a6de684d06a..6ec8e605c2a 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -131,8 +131,8 @@ YouMustCreateItAndAllowServerToWrite=Peate looma selle kataloogi ning võimaldab
 CharsetChoice=Kooditabel valik
 CharacterSetClient=Märgistikku kasutatakse genereeritud HTML veebilehti
 CharacterSetClientComment=Vali kooditabel web ekraanil. <br/> Vaikimisi pakutud kooditabel on üks teie andmebaasi.
-CollationConnection=Iseloom sorteerimine et
-CollationConnectionComment=Vali lehekülg kood, mis määratleb tegelase sorteerimine et kasutada andmebaasi. Seda parameetrit nimetatakse ka &quot;võrdlemine&quot;, mida mõned andmebaase. <br/> Seda parameetrit ei ole võimalik määratleda, kui andmebaas on juba olemas.
+DBSortingCollation=Iseloom sorteerimine et
+DBSortingCollationComment=Vali lehekülg kood, mis määratleb tegelase sorteerimine et kasutada andmebaasi. Seda parameetrit nimetatakse ka &quot;võrdlemine&quot;, mida mõned andmebaase. <br/> Seda parameetrit ei ole võimalik määratleda, kui andmebaas on juba olemas.
 CharacterSetDatabase=Kooditabel andmebaasi
 CharacterSetDatabaseComment=Vali kooditabel otsitakse andmebaasi loomist. <br/> Seda parameetrit ei ole võimalik määratleda, kui andmebaas on juba olemas.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Te küsite, et luua andmebaas <b>%s,</b> kuid selleks, Dolibarr vaja ühendada server <b>%s</b> super kasutaja <b>%s</b> õigused.
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 61d5853ade7..545d17c8f76 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -123,8 +123,8 @@ YouMustCreateItAndAllowServerToWrite=يجب إنشاء هذا الدليل ، و
 CharsetChoice=اختيار مجموعة حروف
 CharacterSetClient=مجموعة الحروف المستخدمة في توليدها صفحات هتمل
 CharacterSetClientComment=اختيار الطابع المحدد لعرضها على الإنترنت. <br/> واقترحت مجموعة الطابع الافتراضي هو واحد من قاعدة البيانات.
-CollationConnection=طابع الفرز بغية
-CollationConnectionComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
+DBSortingCollation=طابع الفرز بغية
+DBSortingCollationComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 CharacterSetDatabase=الطابع المحدد لقاعدة البيانات
 CharacterSetDatabaseComment=اختيار مجموعة حروف تريد لإنشاء قاعدة بيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع المستخدم أذونات <b>٪ ق.</b>
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 4201b815a94..81448a6ab86 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -121,8 +121,8 @@ YouMustCreateItAndAllowServerToWrite=Sinun on luotava tähän hakemistoon ja mah
 CharsetChoice=Merkistö valinta
 CharacterSetClient=Merkistö käytetään tuotettu HTML-sivuja
 CharacterSetClientComment=Valitse merkistö Web-näytön. <br/> Oletus ehdotettu merkistö on yksi tietokannan.
-CollationConnection=Luonne lajittelu jotta
-CollationConnectionComment=Valitse sivun koodi, joka määrittää merkin n lajittelu jotta käyttää tietokantaa. Tämä parametri on myös kutsuttu "kokoamisen" noin tietokantoja. <br/> Tämä parametri ei voida määritellä, jos tietokanta on jo olemassa.
+DBSortingCollation=Luonne lajittelu jotta
+DBSortingCollationComment=Valitse sivun koodi, joka määrittää merkin n lajittelu jotta käyttää tietokantaa. Tämä parametri on myös kutsuttu "kokoamisen" noin tietokantoja. <br/> Tämä parametri ei voida määritellä, jos tietokanta on jo olemassa.
 CharacterSetDatabase=Merkistö tietokanta
 CharacterSetDatabaseComment=Valitse merkistö etsintäkuulutettu tietokannan luomista. <br/> Tämä parametri ei voida määritellä, jos tietokanta on jo olemassa.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Te kysytte luoda <b>tietokanta %s,</b> mutta tästä Dolibarr tarvitse liittää <b>palvelimeen %s</b> Super <b>käyttäjän %s</b> käyttöoikeudet.
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index cb7e7f25251..5c59db99c57 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -20,7 +20,6 @@ AddThisArticle=Ajouter cet article
 RestartSelling=Reprendre la vente
 SellFinished=Vente terminée
 PrintTicket=Imprimer ticket
-NoResults=Aucun résultat
 NoProductFound=Aucun article trouvé
 ProductFound=produit trouvé
 ProductsFound=produits trouvés
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 7bc7ce811d1..da7fbe1b610 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -125,8 +125,8 @@ YouMustCreateItAndAllowServerToWrite=Vous devez créer ce dossier et permettre a
 CharsetChoice=Choix du codage des caractères
 CharacterSetClient=Codage utilisé pour l'affichage des pages
 CharacterSetClientComment=Veuillez choisir le codage que vous souhaitez pour l'affichage des pages.<br/> Le codage proposé par défaut est celui de votre base de données par défaut.
-CollationConnection=Ordre de tri utilisé pour la base de données
-CollationConnectionComment=Veuillez choisir la page de code définissant l'ordre de tri des caractères utilisés par la base de données. Ce paramètre est aussi appelé 'collation' par certaines bases de données.<br/> Ce paramètre n'est pas sélectionnable si votre base est déjà créée.
+DBSortingCollation=Ordre de tri utilisé pour la base de données
+DBSortingCollationComment=Veuillez choisir la page de code définissant l'ordre de tri des caractères utilisés par la base de données. Ce paramètre est aussi appelé 'collation' par certaines bases de données.<br/> Ce paramètre n'est pas sélectionnable si votre base est déjà créée.
 CharacterSetDatabase=Codage utilisé pour la base de données
 CharacterSetDatabaseComment=Veuillez choisir le codage que vous désirez choisir pour la création de la base de données.<br/> Ce paramètre n'est pas sélectionnable si votre base est déjà créée.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Vous avez demandé la création de la base de données <b>%s</b>, mais pour cela, Dolibarr doit se connecter sur le serveur <b>%s</b> via le super utilisateur <b>%s</b>.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index b2147ce7e20..ff50038f5c2 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -629,6 +629,7 @@ BySalesRepresentative=Par commerciaux
 LinkedToSpecificUsers=Liés à un contact utilisateur particulier
 DeleteAFile=Suppression de fichier
 ConfirmDeleteAFile=Confirmez-vous la suppression du fichier
+NoResults=Aucun résultat
 
 # Week day
 Monday=Lundi
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index c2d4ee2d44d..8fa0761a30c 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -131,8 +131,8 @@ YouMustCreateItAndAllowServerToWrite=עליך ליצור את הספרייה ו
 CharsetChoice=התווים הבחירה
 CharacterSetClient=התווים המשמש שנוצר דפי אינטרנט ב-HTML
 CharacterSetClientComment=בחר בערכת התווים להצגה באינטרנט. <br/> מערכת המוצעת מחדל הדמות היא זו של מסד הנתונים.
-CollationConnection=מיון תו כדי
-CollationConnectionComment=בחר קוד מקור המגדיר סדר המיון של הדמות בשימוש על ידי מסד הנתונים. פרמטר זה נקרא גם &quot;איסוף&quot; של כמה מסדי נתונים. <br/> פרמטר זה לא ניתן להגדיר אם מסד הנתונים כבר קיים.
+DBSortingCollation=מיון תו כדי
+DBSortingCollationComment=בחר קוד מקור המגדיר סדר המיון של הדמות בשימוש על ידי מסד הנתונים. פרמטר זה נקרא גם &quot;איסוף&quot; של כמה מסדי נתונים. <br/> פרמטר זה לא ניתן להגדיר אם מסד הנתונים כבר קיים.
 CharacterSetDatabase=התווים עבור מסד הנתונים
 CharacterSetDatabaseComment=בחר בערכת התווים רצה ליצירת מסד הנתונים. <br/> פרמטר זה לא ניתן להגדיר אם מסד הנתונים כבר קיים.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=אתה שואל כדי ליצור מסד נתונים <b>%s,</b> אבל בשביל זה, Dolibarr צריך להתחבר <b>%s</b> שרת עם הרשאות <b>%s</b> סופר משתמש.
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index bb729ba7ce9..b912875ca51 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -119,8 +119,8 @@ YouMustCreateItAndAllowServerToWrite=Létre kell hoznia ezt a könyvtárat és e
 CharsetChoice=Karakter készlet választás
 CharacterSetClient=A generált web oldalakhoz használt karakterkészlet
 CharacterSetClientComment=Válasszon karakterkészletet a webes megjelenitéshez.<br/> Az alapértelmezett az adatbázis karakterkészlete.
-CollationConnection=Karakter rendezés
-CollationConnectionComment=Válasszon kódot ami deifiniálja az adatbázis által használt karakter rendezést. Ezt a paraméter 'illesztés'/'collation'-ként is imseretes egyes adatbázisok esetén.<br/>Ez a paraméter nem megadható ha az adatbázisban már létezik.
+DBSortingCollation=Karakter rendezés
+DBSortingCollationComment=Válasszon kódot ami deifiniálja az adatbázis által használt karakter rendezést. Ezt a paraméter 'illesztés'/'collation'-ként is imseretes egyes adatbázisok esetén.<br/>Ez a paraméter nem megadható ha az adatbázisban már létezik.
 CharacterSetDatabase=Az adatbázis karakterkészlete
 CharacterSetDatabaseComment=Válasszon karakterkészletet az adatbázis létrehozásához.<br/>Ez a paraméter nem megadható ha az adatbázisban már létezik.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=A(z) <b>%s</b> adatbázis létrehozásához az adatbázis szerverhez SuperUser jogosúltságokkal kell csatlakozni.
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index 4035e2a2fbb..6435b12fc13 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -131,8 +131,8 @@ YouMustCreateItAndAllowServerToWrite=Þú verður að búa til þessa möppu og
 CharsetChoice=Stafasett val
 CharacterSetClient=Stafasett notað mynda HTML vefsíðum
 CharacterSetClientComment=Veldu stafasett til birtingar á vefnum. <br/> Default fyrirhugaðar stafasett er einn af gagnasafninu.
-CollationConnection=Eðli flokkun þess
-CollationConnectionComment=Veldu kóða sem skilgreinir flokka til persónu er notaður við gagnagrunn. Þessi stika er einnig kallaður "samanburði" af sumum gagnasöfnum. <br/> Þessi stika er ekki hægt að útskýra ef gagnagrunnur er þegar til.
+DBSortingCollation=Eðli flokkun þess
+DBSortingCollationComment=Veldu kóða sem skilgreinir flokka til persónu er notaður við gagnagrunn. Þessi stika er einnig kallaður "samanburði" af sumum gagnasöfnum. <br/> Þessi stika er ekki hægt að útskýra ef gagnagrunnur er þegar til.
 CharacterSetDatabase=Stafasett fyrir gagnasafn
 CharacterSetDatabaseComment=Veldu stafasett langaði að skapa gagnagrunn. <br/> Þessi stika er ekki hægt að útskýra ef gagnagrunnur er þegar til.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Þú biður að búa til <b>gagnasafn %s ,</b> en fyrir þetta, Dolibarr þarf til að tengjast við <b>miðlara %s </b> með frábær <b>notanda %s </b> aðgangsheimildir.
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 0639923b980..510d5a7abbe 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -21,8 +21,8 @@ CheckToCreateUser					=Seleziona questa opzione se l'utente non esiste e deve es
 CheckToForceHttps					=Seleziona questa opzione per forzare le connessioni sicure (HTTPS).<br/>L'host dev'essere configurato per usare un certificato SSL.
 ChoosedMigrateScript					=Scegli script di migrazione
 ChooseYourSetupMode					=Scegli la modalità di impostazione e clicca "start"
-CollationConnectionComment				=Scegli la codifica per definire l'ordinamento caratteri nel database (Collation).<br/>Questo parametro non può essere definito se il database esiste già. 
-CollationConnection					=Ordinamento caratteri (Collation)
+DBSortingCollationComment				=Scegli la codifica per definire l'ordinamento caratteri nel database (Collation).<br/>Questo parametro non può essere definito se il database esiste già. 
+DBSortingCollation					=Ordinamento caratteri (Collation)
 ConfFileCouldBeCreated					=Il file <b>%s</b> può essere creato. 
 ConfFileDoesNotExistsAndCouldNotBeCreated		=Il file di configurazione <b>%s</b> non esiste e non può essere creato!
 ConfFileDoesNotExists					=Il file di configurazione <b>%s</b> non esiste!
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 46cbef38e03..0d74ebfdd7a 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -84,8 +84,8 @@ YouMustCreateItAndAllowServerToWrite=このディレクトリを作成し、そ
 CharsetChoice=文字セットの選択
 CharacterSetClient=生成されたHTML Webページに使用される文字セット
 CharacterSetClientComment=Web表示用の文字セットを選択します。 <br/>デフォルト提案された文字セットは、データベースの一つです。
-CollationConnection=文字のソート順
-CollationConnectionComment=データベースで使用される文字のソート順序を定義するページのコードを選択してください。このパラメータは、いくつかのデータベースで&quot;照合順序&quot;と呼ばれています。 <br/>データベースがすでに存在している場合、このパラメータは定義することはできません。
+DBSortingCollation=文字のソート順
+DBSortingCollationComment=データベースで使用される文字のソート順序を定義するページのコードを選択してください。このパラメータは、いくつかのデータベースで&quot;照合順序&quot;と呼ばれています。 <br/>データベースがすでに存在している場合、このパラメータは定義することはできません。
 CharacterSetDatabase=データベースの文字セット
 CharacterSetDatabaseComment=データベース作成のためにしたい文字セットを選択します。 <br/>データベースがすでに存在している場合、このパラメータは定義することはできません。
 YouAskDatabaseCreationSoDolibarrNeedToConnect=あなたは、データベースの<b>%sを</b>作成するために求めるが、このために、Dolibarrは、スーパーユーザーの<b>%sの</b>権限でサーバの<b>%s</b>に接続する必要があります。
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index d90bf62954a..7597062d7ea 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -127,8 +127,8 @@ YouMustCreateItAndAllowServerToWrite=Du må lage denne katalogen og la for web-s
 CharsetChoice=Tegnsett valg
 CharacterSetClient=Tegnsett brukes for genererte HTML-nettsider
 CharacterSetClientComment=Velg tegnsettet for web visning. <br/> Standard foreslåtte tegnsett er en av databasen.
-CollationConnection=Tegn sorteringsrekkefølgen
-CollationConnectionComment=Velg side kode som definerer figuren sorteringsrekkefølgen brukes av databasen. Denne parameteren blir også kalt "sortering" av noen databaser. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
+DBSortingCollation=Tegn sorteringsrekkefølgen
+DBSortingCollationComment=Velg side kode som definerer figuren sorteringsrekkefølgen brukes av databasen. Denne parameteren blir også kalt "sortering" av noen databaser. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
 CharacterSetDatabase=Tegnsettet for databasen
 CharacterSetDatabaseComment=Velg tegnsettet ettersøkt for database skaperverk. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=ber deg opprette database <b>%s,</b> men for dette, Dolibarr trenger å koble til serveren <b>%s</b> med superbruker <b>%s</b> tillatelser.
diff --git a/htdocs/langs/nl_BE/install.lang b/htdocs/langs/nl_BE/install.lang
index fc6c4f132c6..6c013aa58c8 100644
--- a/htdocs/langs/nl_BE/install.lang
+++ b/htdocs/langs/nl_BE/install.lang
@@ -115,8 +115,8 @@ YouMustCreateItAndAllowServerToWrite=U moet deze directorie creëren en schrijfr
 CharsetChoice=Tekenset keuze
 CharacterSetClient=Tekenset gebruikt voor gegenereerde HTML-webpagina's
 CharacterSetClientComment=Kies tekenset voor web display. <br/> Standaard voorgesteld tekenset die van uw database.
-CollationConnection=Teken sorteervolgorde
-CollationConnectionComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/> Deze parameter kan niet worden gedefiniëerd als de database al bestaat.
+DBSortingCollation=Teken sorteervolgorde
+DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/> Deze parameter kan niet worden gedefiniëerd als de database al bestaat.
 CharacterSetDatabase=Tekenset voor database
 CharacterSetDatabaseComment=Kies tekenset gewild voor database creatie. <br/> Deze parameter kan niet worden gedefinieerd als database al bestaat.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=U vraagt om database <b>%s</b> te creëren, maar voor dit moet Dolibarr verbinding maken met server <b>%s</b> met super-gebruiker <b>%s</b> machtigingen.
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index 279c1e0541d..b6bccb5d049 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -121,8 +121,8 @@ YouMustCreateItAndAllowServerToWrite = U dient deze map te creëren en de juiste
 CharsetChoice = Keuze van de karakterset
 CharacterSetClient = Karakterset gebruikt door gegenereerde HTML webpagina's
 CharacterSetClientComment = Kies de karakterset voor webweergave.<br/> De standaard voorgestelde karakterset is die van uw database.
-CollationConnection = Karakter sorteervolgorde
-CollationConnectionComment = Kies een paginacodering die de karaktersortering die gebruikt wordt door de database definieert. Deze instelling wordt ook wel 'collatie' genoemd door een aantal databases. <br/> Deze instelling kan niet worden ingesteld als de database al bestaat.
+DBSortingCollation = Karakter sorteervolgorde
+DBSortingCollationComment = Kies een paginacodering die de karaktersortering die gebruikt wordt door de database definieert. Deze instelling wordt ook wel 'collatie' genoemd door een aantal databases. <br/> Deze instelling kan niet worden ingesteld als de database al bestaat.
 CharacterSetDatabase = Karakterset voor de database
 CharacterSetDatabaseComment = Kies de gewenste karakterset die gebruikt wordt voor de databasecreatie.
 YouAskDatabaseCreationSoDolibarrNeedToConnect = U wilt de database <b>%s,</b> creëren, maar hiervoor moet Dolibarr met de server <b>%s</b> verbinden met superuser (root) <b>%s</b> rechten.
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 3a09bff58ed..aac038cf676 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -112,8 +112,8 @@ YouMustCreateItAndAllowServerToWrite=Musisz utworzyć ten katalog i zezwolić se
 CharsetChoice=Wybór zestawu kodowania
 CharacterSetClient=Zestaw kodowania dla wygenerowanych stron HTML
 CharacterSetClientComment=Wybierz zestaw kodowania znaków dla stron HTML.<br/> Domyślnym wyborem zestawu znaków jest ten zastosowany w bazie danych.
-CollationConnection=Sposób sortowania znaków
-CollationConnectionComment=Wybierz stronę kodową, która definiuje sposób sortowania znaków używany przez bazę danych. Ten parametr jest często nazywany 'collation'.<br/>Jeśli baza już istnieje, nie ma możliwości zdefiniowania tego parametru.
+DBSortingCollation=Sposób sortowania znaków
+DBSortingCollationComment=Wybierz stronę kodową, która definiuje sposób sortowania znaków używany przez bazę danych. Ten parametr jest często nazywany 'collation'.<br/>Jeśli baza już istnieje, nie ma możliwości zdefiniowania tego parametru.
 CharacterSetDatabase=Zestaw znaków dla bazy danych
 CharacterSetDatabaseComment=Wybierz zesta znaków, który zostanie użyty do utworzenia bazy danych.<br/>Jeśli baza już istnieje, nie ma możliwości zdefiniowania tego parametru.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Wybrano by utworzyć bazę danych <b>%s</b>, ale by tego dokonać Dolibarr musi połączyć się z serwerem <b>%s</b> na prawach superużytkownika <b>%s</b>.
@@ -330,8 +330,8 @@ YouMustCreateItAndAllowServerToWrite=Du må lage denne katalogen og la for web-s
 CharsetChoice=Tegnsett valg
 CharacterSetClient=Tegnsett brukes for genererte HTML-nettsider
 CharacterSetClientComment=Velg tegnsettet for web visning. <br/> Standard foreslåtte tegnsett er en av databasen.
-CollationConnection=Tegn sorteringsrekkefølgen
-CollationConnectionComment=Velg side kode som definerer figuren sorteringsrekkefølgen brukes av databasen. Denne parameteren blir også kalt "sortering" av noen databaser. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
+DBSortingCollation=Tegn sorteringsrekkefølgen
+DBSortingCollationComment=Velg side kode som definerer figuren sorteringsrekkefølgen brukes av databasen. Denne parameteren blir også kalt "sortering" av noen databaser. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
 CharacterSetDatabase=Tegnsettet for databasen
 CharacterSetDatabaseComment=Velg tegnsettet ettersøkt for database skaperverk. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=ber deg opprette database <b>%s,</b> men for dette, Dolibarr trenger å koble til serveren <b>%s</b> med superbruker <b>%s</b> tillatelser.
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index f3fa394075e..c398d91fcbd 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -115,8 +115,8 @@ YouMustCreateItAndAllowServerToWrite=Você deve criar este diretório e para per
 CharsetChoice=Conjunto de caracteres escolha
 CharacterSetClient=Conjunto de caracteres utilizados para páginas HTML geradas
 CharacterSetClientComment=Escolher conjunto de caracteres para exibir na web. <br/> Padrão proposto um conjunto de caracteres é o do seu banco de dados.
-CollationConnection=Caracteres triagem fim
-CollationConnectionComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados. <br/> Esse parâmetro não pode ser definido se de dados já existe.
+DBSortingCollation=Caracteres triagem fim
+DBSortingCollationComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados. <br/> Esse parâmetro não pode ser definido se de dados já existe.
 CharacterSetDatabase=Conjunto de caracteres para o banco de dados
 CharacterSetDatabaseComment=Escolher conjunto de caracteres queria para o banco de dados criação. <br/> Esse parâmetro não pode ser definido se de dados já existe.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de <b>dados %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 505824e52c4..4110c879efe 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -19,8 +19,8 @@ CheckToCreateUser=Caixa de login, se não existe e deve ser criado. <br> Neste c
 CheckToForceHttps=Marque esta opção para forçar conexões seguras (https). <br> Isso exige que o servidor web está configurado com um certificado SSL.
 ChoosedMigrateScript=Escolhido migrar script
 ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ...
-CollationConnection=Caracteres triagem fim
-CollationConnectionComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados. <br/> Esse parâmetro não pode ser definido se de dados já existe.
+DBSortingCollation=Caracteres triagem fim
+DBSortingCollationComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados. <br/> Esse parâmetro não pode ser definido se de dados já existe.
 ConfFileCouldBeCreated=O ficheiro de configuração <b>conf.php</b> pôde ser criado.
 ConfFileDoesNotExists=Ficheiro de <b>configuração %s</b> não existe!
 ConfFileDoesNotExistsAndCouldNotBeCreated=Ficheiro de <b>configuração %s</b> não existe e não poderia ser criado!
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 8e1012b307a..bbf504158fc 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -922,8 +922,8 @@ YouMustCreateItAndAllowServerToWrite=Trebuie să creaţi acest director şi pent
 CharsetChoice=Set de caractere alegere
 CharacterSetClient=Setul de caractere utilizat pentru paginile web generate HTML
 CharacterSetClientComment=Alegeţi setul de caractere pentru afişarea Web. <br/> Set de caractere implicit propusă este una din baza de date.
-CollationConnection=Caracter de sortare pentru
-CollationConnectionComment=Alege codul paginii, pentru că defineşte caracterul de sortare folosit de baza de date. Acest parametru este, de asemenea, numit &quot;confruntarea&quot; de unele baze de date. <br/> Acest parametru nu poate fi definit în cazul în care baza de date există deja.
+DBSortingCollation=Caracter de sortare pentru
+DBSortingCollationComment=Alege codul paginii, pentru că defineşte caracterul de sortare folosit de baza de date. Acest parametru este, de asemenea, numit &quot;confruntarea&quot; de unele baze de date. <br/> Acest parametru nu poate fi definit în cazul în care baza de date există deja.
 CharacterSetDatabase=Set de caractere pentru baza de date
 CharacterSetDatabaseComment=Alegeţi setul de caractere dorit pentru crearea de baze de date. <br/> Acest parametru nu poate fi definit în cazul în care baza de date există deja.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Să vă întreb pentru a crea <b>%s</b> de baze de date, dar pentru acest lucru, Dolibarr trebuie să se conecteze la server <b>%s</b> cu permisiuni super <b>%s</b> de utilizator.
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 745564c84f1..c1697be23ba 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -121,8 +121,8 @@ YouMustCreateItAndAllowServerToWrite=Вы должны создать этот 
 CharsetChoice=Выбор набора символов
 CharacterSetClient=Набор символов, используемых для порожденных HTML веб-страниц
 CharacterSetClientComment=Выберите набор символов для отображения веб. <br/> Предлагаемый по умолчанию набор символов является одной из Ваших данных.
-CollationConnection=Характер сортировки
-CollationConnectionComment=Выберите страницу код, который определяет характер в сортировки используемых данных. Этот параметр называется также 'обобщение' некоторые базы данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
+DBSortingCollation=Характер сортировки
+DBSortingCollationComment=Выберите страницу код, который определяет характер в сортировки используемых данных. Этот параметр называется также 'обобщение' некоторые базы данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
 CharacterSetDatabase=Набор символов для базы данных
 CharacterSetDatabaseComment=Выберите набор символов, разыскиваемых за создание базы данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Вы спросите для создания базы <b>данных %s,</b> но для этого, Dolibarr необходимо подключиться к <b>серверу %s</b> с супер <b>пользователя% с</b> разрешениями.
@@ -314,8 +314,8 @@ YouMustCreateItAndAllowServerToWrite=Du må lage denne katalogen og la for web-s
 CharsetChoice=Tegnsett valg
 CharacterSetClient=Tegnsett brukes for genererte HTML-nettsider
 CharacterSetClientComment=Velg tegnsettet for web visning. <br/> Standard foreslåtte tegnsett er en av databasen.
-CollationConnection=Tegn sorteringsrekkefølgen
-CollationConnectionComment=Velg side kode som definerer figuren sorteringsrekkefølgen brukes av databasen. Denne parameteren blir også kalt "sortering" av noen databaser. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
+DBSortingCollation=Tegn sorteringsrekkefølgen
+DBSortingCollationComment=Velg side kode som definerer figuren sorteringsrekkefølgen brukes av databasen. Denne parameteren blir også kalt "sortering" av noen databaser. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
 CharacterSetDatabase=Tegnsettet for databasen
 CharacterSetDatabaseComment=Velg tegnsettet ettersøkt for database skaperverk. <br/> Denne parameteren kan ikke defineres dersom databasen allerede eksisterer.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=ber deg opprette database <b>%s,</b> men for dette, Dolibarr trenger å koble til serveren <b>%s</b> med superbruker <b>%s</b> tillatelser.
diff --git a/htdocs/langs/ru_UA/install.lang b/htdocs/langs/ru_UA/install.lang
index b23fdef3145..45d05d6eb5a 100644
--- a/htdocs/langs/ru_UA/install.lang
+++ b/htdocs/langs/ru_UA/install.lang
@@ -102,8 +102,8 @@ YouMustCreateItAndAllowServerToWrite=Вы должны создать эту д
 CharsetChoice=Выбор набора символов
 CharacterSetClient=Набор символов, используемый для сгенерированных HTML веб-страниц
 CharacterSetClientComment=Выберите набор символов для веба. <br/> По умолчанию предлагается набор символов является одним из базы данных.
-CollationConnection=Порядок сортировки символов
-CollationConnectionComment=Выберите страницу код, который определяет порядок сортировки персонажа используются базы данных. Этот параметр также называется &quot;сортировки&quot; на некоторых базах данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
+DBSortingCollation=Порядок сортировки символов
+DBSortingCollationComment=Выберите страницу код, который определяет порядок сортировки персонажа используются базы данных. Этот параметр также называется &quot;сортировки&quot; на некоторых базах данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
 CharacterSetDatabase=Набор символов для базы данных
 KeepDefaultValuesWamp=Вы можете использовать мастер установки из Dolibarr DoliWamp, поэтому значения предлагаемых здесь уже оптимизированы. Изменение их, только если вы знаете, что вы делаете.
 KeepDefaultValuesDeb=Вы можете использовать мастер Dolibarr установки из Linux-пакет (Ubuntu, Debian, Fedora ...), поэтому значения предлагаемых здесь уже оптимизированы. Только пароль владельца базы данных для создания должны быть заполнены. Изменение других параметров, только если вы знаете что вы делаете.
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index cda7ad0229e..ecc44497626 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -121,8 +121,8 @@ YouMustCreateItAndAllowServerToWrite = Ustvariti morate to mapo in dovoliti sple
 CharsetChoice = Izbira nabora znakov
 CharacterSetClient = Nabor znakov, uporabljen za generiranje HTML spletnih strani
 CharacterSetClientComment = Izbira nabora znakov za spletni prikaz.<br/> Privzet predlagan nabor znakov je tisti iz vaše baze podatkov.
-CollationConnection = Vrstni red znakov
-CollationConnectionComment = Izberite kodno tabelo, ki definira zaporedje znakov, ki ga uporablja baza podatkov. Ta parameter se v nekaterih bazah podatkov imenuje tudi 'collation'.<br/>Tega parametra ni možno definirati, če baza podatkov že obstaja.
+DBSortingCollation = Vrstni red znakov
+DBSortingCollationComment = Izberite kodno tabelo, ki definira zaporedje znakov, ki ga uporablja baza podatkov. Ta parameter se v nekaterih bazah podatkov imenuje tudi 'collation'.<br/>Tega parametra ni možno definirati, če baza podatkov že obstaja.
 CharacterSetDatabase = Nabor znakov za bazo podatkov
 CharacterSetDatabaseComment = Izberite nabor znakov, ki ga želite za kreiranje baze podatkov.<br/>Tega parametra ni možno definirati, če baza podatkov že obstaja.
 YouAskDatabaseCreationSoDolibarrNeedToConnect = Želeli ste kreirati bazo podatkov <b>%s</b>, vendar se mora za to Dolibarr povezati s strežnikom <b>%s</b> z dovoljenji super uporabnika <b>%s</b>.
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index d5faa03021d..27b3611032b 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -127,8 +127,8 @@ YouMustCreateItAndAllowServerToWrite=Du måste skapa denna katalog och möjligg
 CharsetChoice=Teckenuppsättning val
 CharacterSetClient=Teckenuppsättning som används för genererade HTML-sidor
 CharacterSetClientComment=Välj teckenuppsättning för visning på webben. <br/> Standard föreslagna teckenuppsättning är en av din databas.
-CollationConnection=Tecken sorteringsordning
-CollationConnectionComment=Välj sida kod som definierar karaktärens sorteringsordningen används av databasen. Denna parameter kallas även &quot;sammanställning&quot; av vissa databaser. <br/> Denna parameter kan inte definieras om databasen redan finns.
+DBSortingCollation=Tecken sorteringsordning
+DBSortingCollationComment=Välj sida kod som definierar karaktärens sorteringsordningen används av databasen. Denna parameter kallas även &quot;sammanställning&quot; av vissa databaser. <br/> Denna parameter kan inte definieras om databasen redan finns.
 CharacterSetDatabase=Teckenuppsättningen för databasen
 CharacterSetDatabaseComment=Välj teckenuppsättning som söks för databas skapas. <br/> Denna parameter kan inte definieras om databasen redan finns.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Du ber att skapa databasen <b>%s,</b> men för detta Dolibarr behöver ansluta till servern <b>%s</b> med super user <b>%s</b> behörigheter.
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index f3abb1d4cb2..7967446d570 100755
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -131,8 +131,8 @@ YouMustCreateItAndAllowServerToWrite=Bu dizini oluşturmanız ve web sunucusuna
 CharsetChoice=Karakter seti seçimi
 CharacterSetClient=HTML web sayfalarında kullanılmak üzere oluşturulan karakter seti
 CharacterSetClientComment=Web görüntüsü için karakter seti seçin.<br/> Varsayılan önerilen karakter seti veritabanınızda olanlardan biridir.
-CollationConnection=Karakter sıralama düzeni
-CollationConnectionComment=Veritabanı tarafından kullanılan karakterlerin sıralam düzenini tanımlayan sayfa kodunu kullanın. Bu parametre bazı veritabanları tarafından 'harmanlama' olarak adlandırılır. <br/> Eğer veritabanı zaten varsa bu parametre tanımlanamaz.
+DBSortingCollation=Karakter sıralama düzeni
+DBSortingCollationComment=Veritabanı tarafından kullanılan karakterlerin sıralam düzenini tanımlayan sayfa kodunu kullanın. Bu parametre bazı veritabanları tarafından 'harmanlama' olarak adlandırılır. <br/> Eğer veritabanı zaten varsa bu parametre tanımlanamaz.
 CharacterSetDatabase=Veritabanı için karakter seti
 CharacterSetDatabaseComment=Veritabanı oluşturmak istenen karakter setini seçin.<br/> Eğer veritabanı zaten varsa bu parametre tanımlanamaz.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=<b>%s</b> veritabanını oluşturmanız istenebilir, bunun için, Dolibarr <b>%s</b> sunucusuna <b>%s</b> süper kullanıcı izniyle bağlanmak ister.
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 1ed86cd67a2..9685a7b9f4b 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -126,8 +126,8 @@ YouMustCreateItAndAllowServerToWrite=您必须创建此目录和Web服务器允
 CharsetChoice=字符集的选择
 CharacterSetClient=字符集生成的HTML网页使用
 CharacterSetClientComment=选择字符集的网页显示。 <br/>默认建议的字符集是您的数据库之一。
-CollationConnection=字符排序
-CollationConnectionComment=选择页面的代码定义字符的排序顺序由数据库使用。此参数也被称为'整理一些数据库的。 <br/>此参数不能被定义，如果数据库已经存在。
+DBSortingCollation=字符排序
+DBSortingCollationComment=选择页面的代码定义字符的排序顺序由数据库使用。此参数也被称为'整理一些数据库的。 <br/>此参数不能被定义，如果数据库已经存在。
 CharacterSetDatabase=数据库字符集
 CharacterSetDatabaseComment=选择想要的字符集的数据库创建。 <br/>此参数不能被定义，如果数据库已经存在。
 YouAskDatabaseCreationSoDolibarrNeedToConnect=你问到创建数据库<b>％s，</b>但对于这一点，Dolibarr需要连接到伺服器<b>％S</b>与超级用户<b>％s</b>的权限。
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 329f4c39c62..192528ec126 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -126,8 +126,8 @@ YouMustCreateItAndAllowServerToWrite=您必須創建此目錄和Web服務器允
 CharsetChoice=字符集的選擇
 CharacterSetClient=字符集生成的HTML網頁使用
 CharacterSetClientComment=選擇字符集的網頁顯示。 <br/>默認建議的字符集是您的數據庫之一。
-CollationConnection=字符排序
-CollationConnectionComment=選擇頁面的代碼定義字符的排序順序由數據庫使用。此參數也被稱為'整理一些數據庫的。 <br/>此參數不能被定義，如果數據庫已經存在。
+DBSortingCollation=字符排序
+DBSortingCollationComment=選擇頁面的代碼定義字符的排序順序由數據庫使用。此參數也被稱為'整理一些數據庫的。 <br/>此參數不能被定義，如果數據庫已經存在。
 CharacterSetDatabase=數據庫字符集
 CharacterSetDatabaseComment=選擇想要的字符集的數據庫創建。 <br/>此參數不能被定義，如果數據庫已經存在。
 YouAskDatabaseCreationSoDolibarrNeedToConnect=你問到創建數據庫<b>％s，</b>但對於這一點，Dolibarr需要連接到伺服器<b>％S</b>與超級用戶<b>％s</b>的權限。
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 0ad9962ac1e..151920e614f 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -36,8 +36,8 @@ function llxHeaderPaypal($title, $head = "")
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-	$appli='Dolibarr';
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	$appli='Dolibarr';
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
 
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
 	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 89c57e87139..c311fd20893 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -761,7 +761,7 @@ if ($found && ! $error)	// We are in a management option and no error
 }
 else
 {
-	dol_print_error_email();
+	dol_print_error_email('ERRORNEWPAYMENTPAYBOX');
 }
 
 print '</td></tr>'."\n";
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index afd0cb40c1d..2bec850d6c2 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -944,7 +944,7 @@ if ($found && ! $error)	// We are in a management option and no error
 }
 else
 {
-	dol_print_error_email();
+	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
 }
 
 print '</td></tr>'."\n";
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 860e6cc09e6..103869e1850 100755
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -144,21 +144,21 @@ class ExportTest extends PHPUnit_Framework_TestCase
         $model='csv';
 
         // Build export file
-        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), array(), $sql);
+        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult=1;
         $this->assertEquals($result,$expectedresult);
 
         $model='tsv';
 
         // Build export file
-        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), array(), $sql);
+        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult=1;
         $this->assertEquals($result,$expectedresult);
 
         $model='excel';
 
         // Build export file
-        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), array(), $sql);
+        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult=1;
         $this->assertEquals($result,$expectedresult);
 
@@ -195,21 +195,21 @@ class ExportTest extends PHPUnit_Framework_TestCase
     	$model='csv';
 
     	// Build export file
-    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $array_filtered, $sql);
+    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
     	$expectedresult=1;
     	$this->assertEquals($result,$expectedresult);
 
     	$model='tsv';
 
     	// Build export file
-    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $array_filtered, $sql);
+    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
     	$expectedresult=1;
     	$this->assertEquals($result,$expectedresult);
 
     	$model='excel';
 
     	// Build export file
-    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $array_filtered, $sql);
+    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
     	$expectedresult=1;
     	$this->assertEquals($result,$expectedresult);
 
@@ -234,7 +234,7 @@ class ExportTest extends PHPUnit_Framework_TestCase
         $result=$objexport->load_arrays($user,$datatoexport);
 
         // Build export file
-        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), array(), $sql);
+        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult=1;
         $this->assertEquals($result,$expectedresult);