Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql

ChangeLog

@@ -26,6 +26,7 @@ For users:
 - New: Can insert URL links into elements lines. Also reported into PDF.
 - New: When a member is validated, we can subscribe to mailing-lists
        according to its type.
+- New: Add a tab into members statistics to count members by nature.
 - New: Add link to third party into sells and purchase journal.
 - New: Suggest a method to generate a backup file for user with no access
        to mysqldump binary.
@@ -50,9 +51,10 @@ For users:
 - New: Allow to search product from barcodes directly from invoices, proposals... through AJAX.
 - New: Can make one invoice for several orders.
 - New: POS module can works with only one payment method (cach, chq, credit card).
-- New: Add possibility to defined position/job of a user
+- New: Add possibility to defined position/job of a user.
-- New: [ task #210 ] Can choose cash account during POS login
+- New: Add hidden option to add slashes between lines into PDF.
-- New: [ task #104 ] Can create an invoice from several orders
+- New: [ task #210 ] Can choose cash account during POS login.
+- New: [ task #104 ] Can create an invoice from several orders.
 - New: Update libs/tools/logo for DoliWamp (now use PHP 5.3).
 - New: Added ODT Template tag {object_total_discount}
 - New: Add new import options: Third parties bank details, warehouses and stocks, categories and suppliers prices

htdocs/adherents/stats/byproperties.php

@@ -0,0 +1,151 @@
+<?php
+/* Copyright (c) 2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/adherents/stats/byproperties.php
+ *      \ingroup    member
+ *		\brief      Page with statistics on members
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+$graphwidth = 700;
+$mapratio = 0.5;
+$graphheight = round($graphwidth * $mapratio);
+
+$mode=GETPOST('mode')?GETPOST('mode'):'';
+
+
+// Security check
+if ($user->societe_id > 0)
+{
+	$action = '';
+	$socid = $user->societe_id;
+}
+if (! $user->rights->adherent->cotisation->lire)
+	accessforbidden();
+
+$year = strftime("%Y", time());
+$startyear=$year-2;
+$endyear=$year;
+
+
+
+/*
+ * View
+ */
+
+$memberstatic=new Adherent($db);
+
+llxHeader('','','','',0,0,array('http://www.google.com/jsapi'));
+
+$title=$langs->trans("MembersStatisticsByProperties");
+
+print_fiche_titre($title, $mesg);
+
+dol_mkdir($dir);
+
+$tab='byproperties';
+
+$data = array();
+$sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, d.morphy as code";
+$sql.=" FROM ".MAIN_DB_PREFIX."adherent as d";
+$sql.=" WHERE d.entity IN (".getEntity().")";
+$sql.=" AND d.statut = 1";
+$sql.=" GROUP BY d.morphy";
+
+$foundphy=$foundmor=0;
+
+// Define $data array
+dol_syslog("Count member sql=".$sql);
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num=$db->num_rows($resql);
+	$i=0;
+	while ($i < $num)
+	{
+		$obj=$db->fetch_object($resql);
+
+		if ($obj->code == 'phy') $foundphy++;
+		if ($obj->code == 'mor') $foundmor++;
+
+		$data[]=array('label'=>$obj->code, 'nb'=>$obj->nb, 'lastdate'=>$db->jdate($obj->lastdate));
+
+		$i++;
+	}
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+$head = member_stats_prepare_head($adh);
+
+dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), 0, 'user');
+
+
+// Print title
+if (! count($data))
+{
+	print $langs->trans("NoValidatedMemberYet").'<br>';
+	print '<br>';
+}
+else
+{
+	print_fiche_titre($langs->trans("MembersByNature"),'','');
+}
+
+// Print array
+print '<table class="border" width="100%">';
+print '<tr class="liste_titre">';
+print '<td align="center">'.$langs->trans("Nature").'</td>';
+print '<td align="center">'.$langs->trans("NbOfMembers").'</td>';
+print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
+print '</tr>';
+
+if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
+if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
+
+$oldyear=0;
+$var=true;
+foreach ($data as $val)
+{
+	$year = $val['year'];
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td align="center">'.$memberstatic->getmorphylib($val['label']).'</td>';
+	print '<td align="right">'.$val['nb'].'</td>';
+	print '<td align="right">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
+	print '</tr>';
+	$oldyear=$year;
+}
+
+print '</table>';
+
+
+dol_fiche_end();
+
+
+llxFooter();
+
+$db->close();
+?>

htdocs/adherents/stats/geo.php

@@ -277,7 +277,8 @@ if ($mode)
 dol_fiche_end();
 
 
-$db->close();
 
 llxFooter();
+
+$db->close();
 ?>

htdocs/admin/mails.php

@@ -591,19 +591,19 @@ else
 
 	print '</table>';
 
-    // Warning 1
     if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
     {
         print '<br>';
+        /*
+	    // Warning 1
     	if ($linuxlike)
     	{
     		$sendmailoption=ini_get('mail.force_extra_parameters');
-    		//print 'x'.$sendmailoption;
     		if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption))
     		{
     			print info_admin($langs->trans("SendmailOptionNotComplete"));
     		}
-    	}
+    	}*/
     	// Warning 2
    	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
     }
@@ -657,11 +657,11 @@ else
 		print '<br>';
 	}
 
-	// Affichage formulaire de TEST simple
+	// Show email send test form
-	if ($action == 'test')
+	if ($action == 'test' || $action == 'testhtml')
 	{
 		print '<br>';
-		print_titre($langs->trans("DoTestSend"));
+		print_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -678,62 +678,16 @@ else
 		$formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
 		$formmail->withtopicreadonly=0;
 		$formmail->withfile=2;
-		$formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("PredefinedMailTest"));
+		$formmail->withbody=(isset($_POST['message'])?$_POST['message']:($action == 'testhtml'?$langs->trans("PredefinedMailTestHtml"):$langs->trans("PredefinedMailTest")));
 		$formmail->withbodyreadonly=0;
 		$formmail->withcancel=1;
 		$formmail->withdeliveryreceipt=1;
-		$formmail->withfckeditor=0;
+		$formmail->withfckeditor=($action == 'testhtml'?1:0);
-		// Tableau des substitutions
-		$formmail->substit=$substitutionarrayfortest;
-		// Tableau des parametres complementaires du post
-		$formmail->param["action"]="send";
-		$formmail->param["models"]="body";
-		$formmail->param["mailid"]=0;
-		$formmail->param["returnurl"]=$_SERVER["PHP_SELF"];
-
-		// Init list of files
-        if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-		}
-
-		$formmail->show_form('addfile','removefile');
-
-		print '<br>';
-	}
-
-	// Affichage formulaire de TEST HTML
-	if ($action == 'testhtml')
-	{
-		print '<br>';
-		print_titre($langs->trans("DoTestSendHTML"));
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->withfromreadonly=0;
-		$formmail->withsubstit=0;
-		$formmail->withfrom=1;
-		$formmail->witherrorsto=1;
-		$formmail->withto=(! empty($_POST['sendto'])?$_POST['sendto']:($user->email?$user->email:1));
-		$formmail->withtocc=(! empty($_POST['sendtocc'])?$_POST['sendtocc']:1);       // ! empty to keep field if empty
-		$formmail->withtoccc=(! empty($_POST['sendtoccc'])?$_POST['sendtoccc']:1);    // ! empty to keep field if empty
-		$formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
-		$formmail->withtopicreadonly=0;
-		$formmail->withfile=2;
-		$formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("PredefinedMailTestHtml"));
-		//$formmail->withbody='Test <b>aaa</b> __LOGIN__';
-		$formmail->withbodyreadonly=0;
-		$formmail->withcancel=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withfckeditor=1;
 		$formmail->ckeditortoolbar='dolibarr_mailings';
 		// Tableau des substitutions
 		$formmail->substit=$substitutionarrayfortest;
 		// Tableau des parametres complementaires du post
-		$formmail->param["action"]="sendhtml";
+		$formmail->param["action"]=($action == 'testhtml'?"sendhtml":"send");
 		$formmail->param["models"]="body";
 		$formmail->param["mailid"]=0;
 		$formmail->param["returnurl"]=$_SERVER["PHP_SELF"];
@@ -744,7 +698,7 @@ else
 			$formmail->clear_attached_files();
 		}
 
-		$formmail->show_form('addfilehtml','removefilehtml');
+		$formmail->show_form(($action == 'testhtml'?'addfilehtml':'addfile'),($action == 'testhtml'?'removefilehtml':'removefile'));
 
 		print '<br>';
 	}

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);

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);

htdocs/core/class/conf.class.php

@@ -371,7 +371,7 @@ class Conf
 		$this->css  = "/theme/".$this->theme."/style.css.php";
 
 		// conf->email_from = email pour envoi par dolibarr des mails automatiques
-		$this->email_from = "dolibarr-robot@domain.com";
+		$this->email_from = "robot@domain.com";
 		if (! empty($this->global->MAIN_MAIL_EMAIL_FROM)) $this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;
 
 		// conf->notification->email_from = email pour envoi par Dolibarr des notifications

htdocs/core/class/html.form.class.php

@@ -2325,6 +2325,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";
@@ -2431,7 +2434,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.'",
@@ -2477,11 +2488,12 @@ class Form
                     }
                 });
 
+                
             	var button = "'.$button.'";
                 if (button.length > 0) {
                 	$( "#" + button ).click(function() {
                 		$("#'.$dialogconfirm.'").dialog("open");
-                	});
+        			});
                 }
             });
             </script>';
@@ -2511,7 +2523,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>';

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() {
+					// use keyup instead change to avoid loosing the product id
-						$("#'.$htmlname.'").val("").trigger("change");
+					$("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);
 					};
   				});';

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	$timestampStart     Timestamp for start date
- *	@param	   timestamp	$timestampEnd       Timestamp de fin
+ *	@param	   timestamp	$timestampEnd       Timestamp for end date
- *	@param     int			$inhour             0: sort le nombre de jour , 1: sort le nombre d'heure (72 max)
+ *	@param     int			$inhour             0: return number of days, 1: return number of hours (72 max)
- *	@param     int			$lastday            We include last day, 0: non, 1:oui
+ *	@param     int			$lastday            We include last day, 0: no, 1:yes
- *	@return    int								Nombre de jours ou d'heures
+ *	@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
 	{

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>';
 }
 
 /**

htdocs/core/lib/member.lib.php

@@ -175,6 +175,11 @@ function member_stats_prepare_head($object)
     $head[$h][2] = 'statstown';
     $h++;
 
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php';
+    $head[$h][1] = $langs->trans('ByProperties');
+    $head[$h][2] = 'statsbyproperties';
+    $h++;
+
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

htdocs/core/lib/price.lib.php

@@ -27,11 +27,11 @@
 /**
  *		Calculate totals (net, vat, ...) of a line.
  *		Value for localtaxX_type are	'0' : local tax not applied
- *										'1' : local tax apply on products and services without vat (vat is not applied on local tax)
+ *										'1' : local tax apply on products and services without vat (vat is not applied for local tax calculation)
  *										'2' : local tax apply on products and services before vat (vat is calculated on amount + localtax)
- *										'3' : local tax apply on products without vat (vat is not applied on local tax)
+ *										'3' : local tax apply on products without vat (vat is not applied for local tax calculation)
  *										'4' : local tax apply on products before vat (vat is calculated on amount + localtax)
- *										'5' : local tax apply on services without vat (vat is not applied on local tax)
+ *										'5' : local tax apply on services without vat (vat is not applied for local tax calculation)
  *										'6' : local tax apply on services before vat (vat is calculated on amount + localtax)
  *										'7' : local tax is a fix amount applied on global invoice
  *
@@ -46,7 +46,22 @@
  *		@param	int		$info_bits					Miscellanous informations on line
  *		@param	int		$type						0/1=Product/service
  *		@param  string	$seller						Thirdparty seller (we need $seller->country_code property). Provided only if seller is the supplier.
- *		@return result[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount, ...)
+ *		@return result[ 0=total_ht, 
+ *						 1=total_vat, 
+ *						 2=total_ttc, 
+ *						 3=pu_ht, 
+ *						 4=pu_tva, 
+ *						 5=pu_ttc, 
+ *						 6=total_ht_without_discount, 
+ *						 7=total_vat_without_discount, 
+ *						 8=total_ttc_without_discount, 
+ *						 9=amount tax1 for total_ht, 
+ *						10=amount tax2 for total_ht, 
+ *						11=amount tax1 for pu_ht, 
+ *						12=amount tax2 for pu_ht, 
+ *						13=not used???, 
+ *						14=amount tax1 for total_ht_without_discount, 
+ *						15=amount tax1 for total_ht_without_discount]
  */
 function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '')
 {
@@ -183,6 +198,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
     {
     	$tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
     	$tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
+    	$pu = price2num($pu / (1 + ($txtva / 100)),'MU');
     }
 
 	$apply_tax = false;

htdocs/core/modules/commande/doc/pdf_einstein.modules.php

@@ -381,6 +381,15 @@ class pdf_einstein extends ModelePDFCommandes
 					$this->localtax1[$localtax1rate]+=$localtax1ligne;
 					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php

@@ -243,6 +243,15 @@ class pdf_expedition_merou extends ModelePdfExpedition
 					$pdf->SetXY(170, $curY);
 					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php

@@ -262,6 +262,15 @@ class pdf_expedition_rouget extends ModelePdfExpedition
 					$pdf->SetXY($this->posxqtytoship, $curY);
 					$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped,'','C');
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/modules/facture/doc/pdf_crabe.modules.php

@@ -382,6 +382,15 @@ class pdf_crabe extends ModelePDFFactures
 					$this->localtax1[$localtax1rate]+=$localtax1ligne;
 					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php

@@ -305,6 +305,16 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					 if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					 $this->tva[ (string) $object->lines[$i]->tva_tx ] += $tvaligne;
 					 */
+
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

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'";

htdocs/core/modules/project/pdf/pdf_baleine.modules.php

@@ -226,6 +226,15 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 					$nexY = $pdf->GetY();
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/modules/propale/doc/pdf_azur.modules.php

@@ -379,6 +379,15 @@ class pdf_azur extends ModelePDFPropales
 					$this->localtax1[$localtax1rate]+=$localtax1ligne;
 					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php

@@ -337,6 +337,15 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$this->localtax1[$localtax1rate]+=$localtax1ligne;
 					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

@@ -354,6 +354,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$this->localtax1[$localtax1rate]+=$localtax1ligne;
 					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages

htdocs/core/tpl/freeproductline_create.tpl.php

@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin       <regis@dolibarr.fr>
+/* Copyright (C) 2010-2012	Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2010-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
+ * 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"
+<form name="addproduct" id="addproduct"	action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-	action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add"
+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-	method="POST">
+<input type="hidden" name="action" value="addline" />
-	<input type="hidden" name="token"
+<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
-		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>

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>
+		<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"]:''); ?>">
+		<input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
-  </td>
+	</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) {

htdocs/expedition/fiche.php

@@ -661,6 +661,7 @@ if ($action == 'create')
             print '<td colspan="3">';
             $expe->fetch_delivery_methods();
             print $form->selectarray("expedition_method_id",$expe->meths,GETPOST('expedition_method_id','int'),1,0,0,"",1);
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
             print "</td></tr>\n";
 
             // Tracking number
@@ -1116,6 +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);
                 print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
                 print '</form>';
             }

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;
 		}
@@ -257,18 +253,18 @@ class Export
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (strpos($ValueField, "%") > 0)
+				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery=" ".$NameField." like '".$ValueField."'";
+					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
 				else
-					$szFilterQuery=" ".$NameField."='".$ValueField."'";
+					$szFilterQuery.=" ".$NameField."='".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery= $this->conditionDate($NameField,$ValueArray[0],">=");
+					$szFilterQuery ="(".$this->conditionDate($NameField,$ValueArray[0],">=");
-					$szFilterQuery.=" and ".$this->conditionDate($NameField,$ValueArray[1],"<=");
+					$szFilterQuery.=" AND ".$this->conditionDate($NameField,$ValueArray[1],"<=").")";
 				}
 				else
 				{
@@ -286,8 +282,8 @@ class Export
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery=$NameField.">=".$ValueArray[0];
+					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
-					$szFilterQuery.=" and ".$NameField."<=".$ValueArray[1];
+					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
 				}
 				else
 				{
@@ -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 ';
+				if ($ValueField=='yes') $szFilterField.=' selected ';
-				$szFilterField.=' value="1">'.yn(1).'</option>';
+				$szFilterField.=' value="yes">'.yn(1).'</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='0') $szFilterField.=' selected ';
+				if ($ValueField=='no') $szFilterField.=' selected ';
-				$szFilterField.=' value="0">'.yn(0).'</option>';
+				$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;

htdocs/exports/export.php

@@ -94,7 +94,6 @@ $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_filtervalue=isset($_SESSION["export_FilterValue_fields"])?$_SESSION["export_FilterValue_fields"]:array();
 $datatoexport=GETPOST("datatoexport");
 $action=GETPOST('action', 'alpha');
@@ -116,8 +115,8 @@ $sqlusedforexport='';
 
 $upload_dir = $conf->export->dir_temp.'/'.$user->id;
 
-$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
+//$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
-//$usefilters=1;
+$usefilters=1;
 
 
 /*
@@ -189,53 +188,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,24 +215,23 @@ 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();
-    $array_filtered=array();
 }
 
 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>';
+		setEventMessage($objexport->error, 'errors');
 	}
 	else
 	{
-	    $mesg='<div class="ok">'.$langs->trans("FileSuccessfullyBuilt").'</div>';
+		setEventMessage($langs->trans("FileSuccessfullyBuilt"));
 	    $sqlusedforexport=$objexport->sqlusedforexport;
     }
 }
@@ -306,6 +257,7 @@ if ($action == 'deleteprof')
 	}
 }
 
+// TODO The export for filter is not yet implemented (old code created conflicts with step 2). We must use same way of working and same combo list of predefined export than step 2.
 if ($action == 'add_export_model')
 {
 	if ($export_name)
@@ -320,51 +272,44 @@ if ($action == 'add_export_model')
 			$hexa.=$key;
 		}
 
-		$hexafilter='';
 		$hexafiltervalue='';
-		foreach($array_filtered as $key=>$val)
+		foreach($array_filtervalue as $key=>$val)
 		{
-			if ($hexafilter) $hexafilter.=',';
 			if ($hexafilter) $hexafiltervalue.=',';
-			$hexafilter.=$key;
+			$hexafiltervalue.=$key.'='.$val;
-			$hexafiltervalue.=$array_filtervalue[$key];
 		}
 
 	    $objexport->model_name = $export_name;
 	    $objexport->datatoexport = $datatoexport;
 	    $objexport->hexa = $hexa;
-	    $objexport->hexafilter = $hexafilter;
 	    $objexport->hexafiltervalue = $hexafiltervalue;
 
 	    $result = $objexport->create($user);
 		if ($result >= 0)
 		{
-		    $mesg='<div class="ok">'.$langs->trans("ExportModelSaved",$objexport->model_name).'</div>';
+			setEventMessage($langs->trans("ExportModelSaved",$objexport->model_name));
 		}
 		else
 		{
 			$langs->load("errors");
 			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
+				setEventMessage($langs->trans("ErrorExportDuplicateProfil"), 'errors');
-				$mesg='<div class="error">'.$langs->trans("ErrorExportDuplicateProfil").'</div>';
+			else
-			}
+				setEventMessage($objexport->error, 'errors');
-			else $mesg='<div class="error">'.$objexport->error.'</div>';
 		}
 	}
 	else
 	{
-	    $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("ExportModelName")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("ExportModelName")), 'errors');
 	}
 }
 
 if ($step == 2 && $action == 'select_model')
 {
     $_SESSION["export_selected_fields"]=array();
-    $_SESSION["export_filtered_fields"]=array();
     $_SESSION["export_FilterValue_fields"]=array();
 
     $array_selected=array();
-    $array_filtered=array();
     $array_filtervalue=array();
 
     $result = $objexport->fetch($exportmodelid);
@@ -384,29 +329,37 @@ if ($step == 2 && $action == 'select_model')
 		$i=1;
 		foreach($fieldsarray as $val)
 		{
-			$array_filtered[$val]=$i;
+			$tmp=explode('=',$val);
-			$array_filtervalue[$val]=$fieldsarrayvalue[$i-1];
+			$array_filtervalue[$tmp[0]]=$tmp[1];
 			$i++;
 		}
-		$_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]];
+			$newcode=(string) preg_replace('/\./','_',$code);
-			$objexport->array_export_FilterValue[0][$code] = (isset($objexport->array_export_fields[0][$code])?$_POST[$objexport->array_export_fields[0][$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) && (is_numeric($_POST[$newcode]) && $_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 +368,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');
@@ -486,9 +438,6 @@ if ($step == 1 || ! $datatoexport)
     print '</table>';
 
     print '</div>';
-
-    if ($mesg) print $mesg;
-
 }
 
 if ($step == 2 && $datatoexport)
@@ -566,7 +515,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];
@@ -634,8 +583,6 @@ if ($step == 2 && $datatoexport)
 
     print '</div>';
 
-    if ($mesg) print $mesg;
-
     /*
      * Barre d'action
      *
@@ -741,7 +688,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 +714,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 +725,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);
@@ -800,12 +750,9 @@ if ($step == 3 && $datatoexport)
 
 	print '</div>';
 
-	if ($mesg) print $mesg;
-
 	/*
 	 * Barre d'action
-	*
+	 */
-	*/
 	print '<div class="tabsAction">';
 	// il n'est pas obligatoire de filtrer les champs
 	print '<a class="butAction" href="javascript:FilterField.submit();">'.$langs->trans("NextStep").'</a>';
@@ -865,7 +812,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 +820,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>';
 
@@ -952,11 +902,8 @@ if ($step == 4 && $datatoexport)
 
     print '</table>';
 
-
     print '</div>';
 
-    if ($mesg) print $mesg;
-
     /*
      * Barre d'action
      *
@@ -1027,7 +974,6 @@ if ($step == 4 && $datatoexport)
         print '</table>';
         print '</form>';
     }
-
 }
 
 if ($step == 5 && $datatoexport)
@@ -1095,7 +1041,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 +1051,21 @@ if ($step == 5 && $datatoexport)
     }
     print '<td>'.$list.'</td></tr>';
 
-    // Nbre champs filtres
+    // List of filtered fiels
-    if (is_array($objexport->array_export_TypeFields[0]))
+    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>';
@@ -1149,12 +1097,7 @@ if ($step == 5 && $datatoexport)
     print '</div>';
 
     print '<table width="100%">';
-    if ($mesg)
+
-    {
-    	print '<tr><td colspan="2">';
-    	print $mesg;
-    	print '</td></tr>';
-    }
     if ($sqlusedforexport && $user->admin)
     {
     	print '<tr><td>';
@@ -1175,14 +1118,12 @@ if ($step == 5 && $datatoexport)
     print '</table>';
 }
 
-
 print '<br>';
 
+llxFooter();
 
 $db->close();
 
-llxFooter();
-
 
 /**
  * 	Return table name of an alias. For this, we look for the "tablename as alias" in sql string.

htdocs/fourn/class/fournisseur.facture.class.php

@@ -30,8 +30,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 
 
 /**
- *	\class      FactureFournisseur
+ *	Class to manage suppliers invoices
- *	\brief      Class to manage suppliers invoices
  */
 class FactureFournisseur extends CommonInvoice
 {
@@ -618,6 +617,8 @@ class FactureFournisseur extends CommonInvoice
         	// We remove directory
         	if ($conf->fournisseur->facture->dir_output)
         	{
+        		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
         		$ref = dol_sanitizeFileName($this->ref);
         		$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2).$ref;
         		$file = $dir . "/" . $ref . ".pdf";
@@ -632,6 +633,7 @@ class FactureFournisseur extends CommonInvoice
         		if (file_exists($dir))
         		{
         			$res=@dol_delete_dir_recursive($dir);
+
         			if (! $res)
         			{
         				$this->error='ErrorFailToDeleteDir';

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_debut'] = $this->db->jdate($obj->date_debut);
-                $tab_result[$i]['date_fin'] = $obj->date_fin;
+                $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;

htdocs/holiday/fiche.php

@@ -563,13 +563,12 @@ if ($action == 'confirm_cancel' && $_GET['confirm'] == 'yes')
 
 
 
-/***************************************************
+/*
  * View
-****************************************************/
+ */
 
 $form = new Form($db);
 
-
 llxHeader(array(),$langs->trans('CPTitreMenu'));
 
 if (empty($id) || $action == 'add' || $action == 'request')
@@ -753,35 +752,36 @@ else
             //print_fiche_titre($langs->trans('TitreRequestCP'));
 
             // Si il y a une erreur
-            if (GETPOST('error')) {
+            if (GETPOST('error')) 
-
+            {
-                switch(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)

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 = $infos_CP['date_create'];
-		$date = date_format($date,'Y-m-d');
 
 		$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";
 

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

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>';
 }
 

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>';
 

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;
 }
 
 

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"

htdocs/install/mysql/data/llx_const.sql

@@ -46,7 +46,7 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_U
 
 -- Hidden but specific to one entity 
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0,1);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',0,1);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',0,1);
 
 --
 -- IHM

htdocs/install/mysql/migration/3.2.0-3.3.0.sql

@@ -825,3 +825,35 @@ ALTER TABLE llx_c_type_fees DROP INDEX code, ADD UNIQUE uk_c_type_fees (code);
 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);
+
+-- Update dictionnary of table llx_c_paper_format
+DELETE FROM llx_c_paper_format;
+
+-- Europe
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1,   'EU4A0',       'Format 4A0',                '1682', '2378', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2,   'EU2A0',       'Format 2A0',                '1189', '1682', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3,   'EUA0',        'Format A0',                 '840',  '1189', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4,   'EUA1',        'Format A1',                 '594',  '840',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5,   'EUA2',        'Format A2',                 '420',  '594',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6,   'EUA3',        'Format A3',                 '297',  '420',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7,   'EUA4',        'Format A4',                 '210',  '297',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8,   'EUA5',        'Format A5',                 '148',  '210',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9,   'EUA6',        'Format A6',                 '105',  '148',  'mm', 1);
+
+-- US
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (100, 'USLetter',    'Format Letter (A)',         '216',  '279',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (105, 'USLegal',     'Format Legal',              '216',  '356',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (110, 'USExecutive', 'Format Executive',          '190',  '254',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (115, 'USLedger',    'Format Ledger/Tabloid (B)', '279',  '432',  'mm', 1);
+
+-- Canadian
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (200, 'CAP1',        'Format Canadian P1',        '560',  '860',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (205, 'CAP2',        'Format Canadian P2',        '430',  '560',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (210, 'CAP3',        'Format Canadian P3',        '280',  '430',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (215, 'CAP4',        'Format Canadian P4',        '215',  '280',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (220, 'CAP5',        'Format Canadian P5',        '140',  '215',  'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (225, 'CAP6',        'Format Canadian P6',        '107',  '140',  'mm', 1);
+
+
+-- increase field size
+ALTER TABLE llx_bank_account MODIFY COLUMN code_banque varchar(8);

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,
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  datec          datetime,
+  datec				datetime,
-  tms            timestamp,
+  tms				timestamp,
-  ref            varchar(12) NOT NULL,
+  ref				varchar(12) NOT NULL,
-  label          varchar(30) NOT NULL,
+  label				varchar(30) NOT NULL,
-  entity         integer DEFAULT 1 NOT NULL,	-- multi company id
+  entity			integer DEFAULT 1 NOT NULL,	-- multi company id
-  bank           varchar(60),
+  bank				varchar(60),
-  code_banque    varchar(7),
+  code_banque		varchar(8),
-  code_guichet   varchar(6),
+  code_guichet		varchar(6),
-  number         varchar(255),
+  number			varchar(255),
-  cle_rib        varchar(5),
+  cle_rib			varchar(5),
-  bic            varchar(11),
+  bic				varchar(11),
-  iban_prefix    varchar(34),                 -- 34 according to ISO 13616
+  iban_prefix		varchar(34),				-- 34 according to ISO 13616
-  country_iban   varchar(2),				-- deprecated
+  country_iban		varchar(2),					-- deprecated
-  cle_iban       varchar(2),
+  cle_iban			varchar(2),
-  domiciliation  varchar(255),
+  domiciliation		varchar(255),
-  fk_departement integer        DEFAULT NULL,
+  fk_departement	integer        DEFAULT NULL,
-  fk_pays        integer        NOT NULL,
+  fk_pays			integer        NOT NULL,
-  proprio        varchar(60),
+  proprio			varchar(60),
-  adresse_proprio varchar(255),
+  adresse_proprio	varchar(255),
-  courant        smallint DEFAULT 0 NOT NULL,
+  courant			smallint DEFAULT 0 NOT NULL,
-  clos           smallint DEFAULT 0 NOT NULL,
+  clos				smallint DEFAULT 0 NOT NULL,
-  rappro         smallint DEFAULT 1,
+  rappro			smallint DEFAULT 1,
-  url			       varchar(128),
+  url				varchar(128),
-  account_number varchar(8),
+  account_number	varchar(8),
-  currency_code  varchar(3) NOT NULL,
+  currency_code		varchar(3) NOT NULL,
-  min_allowed    integer DEFAULT 0,
+  min_allowed		integer DEFAULT 0,
-  min_desired    integer DEFAULT 0,
+  min_desired		integer DEFAULT 0,
-  comment        text
+  comment			text
-)ENGINE=innodb;
   
--- 
+)ENGINE=innodb;
--- List of codes for the field entity
---
--- 1 : first company bank account
--- 2 : second company bank account
--- 3 : etc...
---

htdocs/langs/ar_SA/install.lang

@@ -123,8 +123,8 @@ YouMustCreateItAndAllowServerToWrite=يجب إنشاء هذا الدليل ، و
 CharsetChoice=اختيار مجموعة حروف
 CharacterSetClient=مجموعة الحروف المستخدمة في توليدها صفحات هتمل
 CharacterSetClientComment=اختيار الطابع المحدد لعرضها على الإنترنت. <br/> واقترحت مجموعة الطابع الافتراضي هو واحد من قاعدة البيانات.
-CollationConnection=طابع الفرز بغية
+DBSortingCollation=طابع الفرز بغية
-CollationConnectionComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
+DBSortingCollationComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 CharacterSetDatabase=الطابع المحدد لقاعدة البيانات
 CharacterSetDatabaseComment=اختيار مجموعة حروف تريد لإنشاء قاعدة بيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع المستخدم أذونات <b>٪ ق.</b>

htdocs/langs/ar_SA/members.lang

@@ -202,7 +202,7 @@ LastSubscriptionDate=آخر موعد الاكتتاب
 LastSubscriptionAmount=آخر مبلغ الاشتراك
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
-MembersStatisticsByTowne=أعضاء إحصاءات بلدة
+MembersStatisticsByTown=أعضاء إحصاءات بلدة
 NbOfMembers=عدد الأعضاء
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
 MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل.

htdocs/langs/bg_BG/install.lang

@@ -132,8 +132,8 @@ YouMustCreateItAndAllowServerToWrite=Трябва да създадете таз
 CharsetChoice=Избор на знаците
 CharacterSetClient=Набор от символи, използвани за генерираните HTML уеб страници
 CharacterSetClientComment=Изберете набор от знаци за уеб дисплей. <br/> Default предлагания набор от символи е един от вашата база данни.
-CollationConnection=За символи сортиране
+DBSortingCollation=За символи сортиране
-CollationConnectionComment=Изберете кода на страницата, която определя подреждане характер, използван от база данни. Този параметър се нарича &quot;съпоставяне&quot; от някои бази данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
+DBSortingCollationComment=Изберете кода на страницата, която определя подреждане характер, използван от база данни. Този параметър се нарича &quot;съпоставяне&quot; от някои бази данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
 CharacterSetDatabase=Набор от знаци за база данни
 CharacterSetDatabaseComment=Изберете набор от символи, издирван за създаването на базата данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Ви помолим да създадете база данни <b>%s,</b> но за това, Dolibarr трябва да се свържете на сървъра <b>%s</b> с супер потребителски разрешения <b>%s.</b>

htdocs/langs/bg_BG/members.lang

@@ -178,7 +178,7 @@ LastSubscriptionDate=Последно абонамент дата
 LastSubscriptionAmount=Последно размера
 MembersStatisticsByCountries=Потребители статистика страната
 MembersStatisticsByState=Потребители статистика щат / провинция
-MembersStatisticsByTowne=Потребители статистика града
+MembersStatisticsByTown=Потребители статистика града
 NbOfMembers=Брой на членовете
 NoValidatedMemberYet=Няма потвърдени намерени
 MembersByCountryDesc=Този екран показва статистическите данни на членовете по страни. Графичен зависи обаче от Google онлайн услуга графика и е достъпна само ако интернет връзката се работи.

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

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
+DBSortingCollation=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
+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>.

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
+DBSortingCollation=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.
+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.

htdocs/langs/da_DK/members.lang

@@ -210,7 +210,7 @@ LastSubscriptionDate=Sidste abonnement dato
 LastSubscriptionAmount=Sidste tegningsbeløbet
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
-MembersStatisticsByTowne=Medlemmer statistikker byen
+MembersStatisticsByTown=Medlemmer statistikker byen
 NbOfMembers=Antal medlemmer
 NoValidatedMemberYet=Ingen validerede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.

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)
+DBSortingCollation=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.
+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.

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 
+DBSortingCollation=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.
+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.

htdocs/langs/de_DE/members.lang

@@ -175,7 +175,7 @@ LastSubscriptionDate=Letzter Abo-Termin
 LastSubscriptionAmount=Letzter Abo-Betrag
 MembersStatisticsByCountries=Mitgliederstatistik nach Ländern
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern
-MembersStatisticsByTowne=Mitgliederstatistik nach Städten
+MembersStatisticsByTown=Mitgliederstatistik nach Städten
 NbOfMembers=Anzahl der Mitglieder
 NoValidatedMemberYet=Kein freizugebenden Mitglieder gefunden
 MembersByCountryDesc=Diese Form zeigt Ihnen die Mitgliederstatistik nach Ländern. Die Grafik basiert auf Googles Online-Grafik-Service ab und funktioniert nur wenn eine Internverbindung besteht.

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
+DBSortingCollation=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.
+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.

htdocs/langs/el_GR/members.lang

@@ -171,7 +171,7 @@ LastSubscriptionDate=Τελευταία ημερομηνία εγγραφής
 LastSubscriptionAmount=Τελευταία ποσό συνδρομής
 MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
-MembersStatisticsByTowne=Τα μέλη στατιστικών στοιχείων από την πόλη
+MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
 NbOfMembers=Αριθμός μελών
 NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
 MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί.

htdocs/langs/en_US/admin.lang

@@ -903,7 +903,7 @@ ExtraFieldsContacts=Complementary attributes (contact/address)
 ExtraFieldHasWrongValue=Attribut %s has a wrong value.
 AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
 SendingMailSetup=Setup of sendings by email
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must conatins option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by thoose bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommanded) is to use the method "SMTP socket library" that has no disadvantages.

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

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
+DBSortingCollation=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.
+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.

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

htdocs/langs/en_US/members.lang

@@ -170,7 +170,7 @@ LastSubscriptionDate=Last subscription date
 LastSubscriptionAmount=Last subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTowne=Members statistics by town
+MembersStatisticsByTown=Members statistics by town
 NbOfMembers=Number of members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
@@ -196,3 +196,6 @@ Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature

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

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
+DBSortingCollation=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
+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>.

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
+DBSortingCollation=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.
+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.

htdocs/langs/et_EE/members.lang

@@ -177,7 +177,7 @@ LastSubscriptionDate=Last tellimise kuupäev
 LastSubscriptionAmount=Last märkimissummast
 MembersStatisticsByCountries=Liikmed statistika riik
 MembersStatisticsByState=Liikmed statistika / maakond
-MembersStatisticsByTowne=Liikmed statistika linn
+MembersStatisticsByTown=Liikmed statistika linn
 NbOfMembers=Liikmete arv
 NoValidatedMemberYet=Ükski valideeritud liikmed leitud
 MembersByCountryDesc=See ekraan näitab teile, statistika liikmetele riikides. Graphic sõltub siiski Google Interneti graafik teenust ning on saadaval vaid siis, kui internetiühendus on töötab.

htdocs/langs/fa_IR/install.lang

@@ -123,8 +123,8 @@ YouMustCreateItAndAllowServerToWrite=يجب إنشاء هذا الدليل ، و
 CharsetChoice=اختيار مجموعة حروف
 CharacterSetClient=مجموعة الحروف المستخدمة في توليدها صفحات هتمل
 CharacterSetClientComment=اختيار الطابع المحدد لعرضها على الإنترنت. <br/> واقترحت مجموعة الطابع الافتراضي هو واحد من قاعدة البيانات.
-CollationConnection=طابع الفرز بغية
+DBSortingCollation=طابع الفرز بغية
-CollationConnectionComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
+DBSortingCollationComment=اختر صفحة المدونة التي تحدد طبيعة النظام 'sفرز قاعدة البيانات التي تستخدمها. هذا هو المعلم كما دعا 'مقارنتها' بعض قواعد البيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 CharacterSetDatabase=الطابع المحدد لقاعدة البيانات
 CharacterSetDatabaseComment=اختيار مجموعة حروف تريد لإنشاء قاعدة بيانات. <br/> هذا المعلم لا يمكن أن يعرف إذا كانت قاعدة البيانات موجودة بالفعل.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع المستخدم أذونات <b>٪ ق.</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
+DBSortingCollation=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.
+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.

htdocs/langs/fi_FI/members.lang

@@ -208,7 +208,7 @@ LastSubscriptionDate=Viimeinen merkintäpäivä
 LastSubscriptionAmount=Viime merkinnän määrästä
 MembersStatisticsByCountries=Jäsenten tilastot maittain
 MembersStatisticsByState=Jäsenten tilastot valtio / lääni
-MembersStatisticsByTowne=Jäsenten tilastot kaupunki
+MembersStatisticsByTown=Jäsenten tilastot kaupunki
 NbOfMembers=Jäsenmäärä
 NoValidatedMemberYet=Ei validoitu jäsenet pitivät
 MembersByCountryDesc=Tämä ruutu näyttää tilastoja jäseniä maittain. Graphic riippuu kuitenkin Googlen online-käyrä palvelu ja on käytettävissä vain, jos internet-yhteys toimii.

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

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
+DBSortingCollation=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.
+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>.

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

htdocs/langs/fr_FR/members.lang

@@ -201,3 +201,6 @@ Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
 DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consultez la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquez sur le bouton au bas de cette page.<br>
+ByProperties=Par caractéristiques
+MembersStatisticsByProperties=Statistiques des adhérents par caractéristiques
+MembersByNature=Adhérents par nature

htdocs/langs/he_IL/install.lang

@@ -131,8 +131,8 @@ YouMustCreateItAndAllowServerToWrite=עליך ליצור את הספרייה ו
 CharsetChoice=התווים הבחירה
 CharacterSetClient=התווים המשמש שנוצר דפי אינטרנט ב-HTML
 CharacterSetClientComment=בחר בערכת התווים להצגה באינטרנט. <br/> מערכת המוצעת מחדל הדמות היא זו של מסד הנתונים.
-CollationConnection=מיון תו כדי
+DBSortingCollation=מיון תו כדי
-CollationConnectionComment=בחר קוד מקור המגדיר סדר המיון של הדמות בשימוש על ידי מסד הנתונים. פרמטר זה נקרא גם &quot;איסוף&quot; של כמה מסדי נתונים. <br/> פרמטר זה לא ניתן להגדיר אם מסד הנתונים כבר קיים.
+DBSortingCollationComment=בחר קוד מקור המגדיר סדר המיון של הדמות בשימוש על ידי מסד הנתונים. פרמטר זה נקרא גם &quot;איסוף&quot; של כמה מסדי נתונים. <br/> פרמטר זה לא ניתן להגדיר אם מסד הנתונים כבר קיים.
 CharacterSetDatabase=התווים עבור מסד הנתונים
 CharacterSetDatabaseComment=בחר בערכת התווים רצה ליצירת מסד הנתונים. <br/> פרמטר זה לא ניתן להגדיר אם מסד הנתונים כבר קיים.
 YouAskDatabaseCreationSoDolibarrNeedToConnect=אתה שואל כדי ליצור מסד נתונים <b>%s,</b> אבל בשביל זה, Dolibarr צריך להתחבר <b>%s</b> שרת עם הרשאות <b>%s</b> סופר משתמש.

htdocs/langs/he_IL/members.lang

@@ -177,7 +177,7 @@ LastSubscriptionDate=מנוי אחרונה תאריך
 LastSubscriptionAmount=המינוי האחרון כמות
 MembersStatisticsByCountries=משתמשים סטטיסטיקה לפי מדינות
 MembersStatisticsByState=חברים הסטטיסטיקה של מדינה / מחוז
-MembersStatisticsByTowne=חברים הסטטיסטיקה של העיר
+MembersStatisticsByTown=חברים הסטטיסטיקה של העיר
 NbOfMembers=מספר החברים
 NoValidatedMemberYet=אין חברים תוקף נמצא
 MembersByCountryDesc=מסך זה מראה לך נתונים סטטיסטיים על החברים של מדינות. עם זאת גרפי תלוי על שירות Google גרף באינטרנט זמינה רק אם החיבור לאינטרנט הוא עובד.

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
+DBSortingCollation=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.
+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.

htdocs/langs/hu_HU/members.lang

@@ -177,7 +177,7 @@ LastSubscriptionDate=Utolsó dátum előfizetés
 LastSubscriptionAmount=Utolsó előfizetés összege
 MembersStatisticsByCountries=Tagok statisztikája ország
 MembersStatisticsByState=Tagok statisztikája állam / tartomány
-MembersStatisticsByTowne=Tagok statisztikája város
+MembersStatisticsByTown=Tagok statisztikája város
 NbOfMembers=Tagok száma
 NoValidatedMemberYet=Nem hitelesített tagok található
 MembersByCountryDesc=Ez a képernyő megmutatja statisztikát tagok országokban. Grafikus függ azonban a Google online grafikon szolgáltatást és csak akkor elérhető, ha az internet kapcsolat működik.

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
+DBSortingCollation=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.
+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.

htdocs/langs/is_IS/members.lang

@@ -190,7 +190,7 @@ LastSubscriptionDate=Síðast áskrift dagsetning
 LastSubscriptionAmount=Síðast áskrift upphæð
 MembersStatisticsByCountries=Notendur tölfræði eftir landi
 MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
-MembersStatisticsByTowne=Notendur tölfræði eftir bænum
+MembersStatisticsByTown=Notendur tölfræði eftir bænum
 NbOfMembers=Fjöldi félaga
 NoValidatedMemberYet=Engar fullgiltar meðlimir fundust
 MembersByCountryDesc=Þessi skjár sýnir þér tölfræði á meðlimum með löndum. Grafísk veltur þó á Google netinu línurit þjónustu og er aðeins í boði ef nettengingin er er að vinna.

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à. 
+DBSortingCollationComment				=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)
+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!

htdocs/langs/it_IT/members.lang

@@ -105,7 +105,7 @@ MembersListValid				    =Elenco dei membri validi
 Members						    =Membri
 MembersStatisticsByCountries			    =Statistiche per paese
 MembersStatisticsByState			    =Statistiche per stato/provincia
-MembersStatisticsByTowne			    =Statistiche per città
+MembersStatisticsByTown			    =Statistiche per città
 MembersStatisticsDesc				    =Scegli quali statistiche visualizzare...
 MembersStatusNotPaid				    =Membri non pagati
 MembersStatusNotPaidShort			    =Non pagati

htdocs/langs/ja_JP/install.lang

@@ -84,8 +84,8 @@ YouMustCreateItAndAllowServerToWrite=このディレクトリを作成し、そ
 CharsetChoice=文字セットの選択
 CharacterSetClient=生成されたHTML Webページに使用される文字セット
 CharacterSetClientComment=Web表示用の文字セットを選択します。 <br/>デフォルト提案された文字セットは、データベースの一つです。
-CollationConnection=文字のソート順
+DBSortingCollation=文字のソート順
-CollationConnectionComment=データベースで使用される文字のソート順序を定義するページのコードを選択してください。このパラメータは、いくつかのデータベースで&quot;照合順序&quot;と呼ばれています。 <br/>データベースがすでに存在している場合、このパラメータは定義することはできません。
+DBSortingCollationComment=データベースで使用される文字のソート順序を定義するページのコードを選択してください。このパラメータは、いくつかのデータベースで&quot;照合順序&quot;と呼ばれています。 <br/>データベースがすでに存在している場合、このパラメータは定義することはできません。
 CharacterSetDatabase=データベースの文字セット
 CharacterSetDatabaseComment=データベース作成のためにしたい文字セットを選択します。 <br/>データベースがすでに存在している場合、このパラメータは定義することはできません。
 YouAskDatabaseCreationSoDolibarrNeedToConnect=あなたは、データベースの<b>%sを</b>作成するために求めるが、このために、Dolibarrは、スーパーユーザーの<b>%sの</b>権限でサーバの<b>%s</b>に接続する必要があります。

htdocs/langs/ja_JP/members.lang

@@ -177,7 +177,7 @@ LastSubscriptionDate=最後のサブスクリプションの日付
 LastSubscriptionAmount=最後のサブスクリプションの量
 MembersStatisticsByCountries=国別メンバー統計
 MembersStatisticsByState=都道府県/州によってメンバーの統計
-MembersStatisticsByTowne=町によってメンバーの統計
+MembersStatisticsByTown=町によってメンバーの統計
 NbOfMembers=会員数
 NoValidatedMemberYet=いいえ検証メンバーが見つかりませんでした
 MembersByCountryDesc=この画面には、国によるメンバーの統計情報を表示します。グラフィックは、Googleのオンライングラフサービスに依存しますが、インターネット接続が機能している場合にのみ使用できます。

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
+DBSortingCollation=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.
+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.

htdocs/langs/nb_NO/members.lang

@@ -185,7 +185,7 @@ LastSubscriptionDate=Siste abonnement dato
 LastSubscriptionAmount=Siste tegningsbeløp
 MembersStatisticsByCountries=Medlemmer statistikk etter land
 MembersStatisticsByState=Medlemmer statistikk etter delstat / provins
-MembersStatisticsByTowne=Medlemmer statistikk etter by
+MembersStatisticsByTown=Medlemmer statistikk etter by
 NbOfMembers=Antall medlemmer
 NoValidatedMemberYet=Ingen validerte medlemmer funnet
 MembersByCountryDesc=Denne skjermen viser deg statistikk på medlemmer av land. Graphic imidlertid avhengig Google elektroniske grafen service og er bare tilgjengelig hvis en internett-tilkobling er fungerer.

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
+DBSortingCollation=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.
+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.

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
+DBSortingCollation = 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.
+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.

htdocs/langs/nl_NL/members.lang

@@ -171,7 +171,7 @@ LastSubscriptionAmount = Laatste abonnementsaantal
 // START - Lines generated via autotranslator.php tool (2011-10-10 01:46:39).
 // Reference language: en_US -> nl_NL
 MembersStatisticsByState=Leden statistieken per staat / provincie
-MembersStatisticsByTowne=Leden van de statistieken per gemeente
+MembersStatisticsByTown=Leden van de statistieken per gemeente
 NbOfMembers=Aantal leden
 NoValidatedMemberYet=Geen gevalideerde leden gevonden
 MembersByCountryDesc=Dit scherm tonen statistieken over de leden door de landen. Grafisch is echter afhankelijk van Google online grafiek service en is alleen beschikbaar als een internet verbinding is werkt.

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
+DBSortingCollation=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.
+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
+DBSortingCollation=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.
+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.

htdocs/langs/pl_PL/members.lang

@@ -200,7 +200,7 @@ LastSubscriptionDate=Ostatnia data abonament
 LastSubscriptionAmount=Ostatnio kwota subskrypcji
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
-MembersStatisticsByTowne=Użytkownicy statystyki na miasto
+MembersStatisticsByTown=Użytkownicy statystyki na miasto
 NbOfMembers=Liczba członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
 MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.

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
+DBSortingCollation=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.
+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.

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
+DBSortingCollation=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.
+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!

htdocs/langs/pt_PT/members.lang

@@ -187,7 +187,7 @@ LastSubscriptionDate=Última data de subscrição
 LastSubscriptionAmount=Montante de subscrição Última
 MembersStatisticsByCountries=Membros estatísticas por país
 MembersStatisticsByState=Membros estatísticas por estado / província
-MembersStatisticsByTowne=Membros estatísticas por cidade
+MembersStatisticsByTown=Membros estatísticas por cidade
 NbOfMembers=Número de membros
 NoValidatedMemberYet=Nenhum membro validado encontrado
 MembersByCountryDesc=Esta tela mostrará estatísticas sobre membros dos países. Gráfico depende, contudo, o serviço Google gráfico on-line e está disponível apenas se uma ligação à Internet é está funcionando.

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
+DBSortingCollation=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.
+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.

htdocs/langs/ro_RO/members.lang

@@ -203,7 +203,7 @@ LastSubscriptionDate=Ultima data de abonament
 LastSubscriptionAmount=Ultima sumă abonament
 MembersStatisticsByCountries=Membri statisticilor în funcţie de ţară
 MembersStatisticsByState=Statistici Membri de stat / provincie
-MembersStatisticsByTowne=Statistici Membri de oraş
+MembersStatisticsByTown=Statistici Membri de oraş
 NbOfMembers=Număr de membri
 NoValidatedMemberYet=Nici membrii validate găsit
 MembersByCountryDesc=Acest ecran vă arată statisticile cu privire la membrii de ţări. Graphic depinde de toate acestea, cu privire la serviciul on-line Google grafic şi este disponibil numai în cazul în care o conexiune la internet este este de lucru.

htdocs/langs/ru_RU/install.lang

@@ -121,8 +121,8 @@ YouMustCreateItAndAllowServerToWrite=Вы должны создать этот
 CharsetChoice=Выбор набора символов
 CharacterSetClient=Набор символов, используемых для порожденных HTML веб-страниц
 CharacterSetClientComment=Выберите набор символов для отображения веб. <br/> Предлагаемый по умолчанию набор символов является одной из Ваших данных.
-CollationConnection=Характер сортировки
+DBSortingCollation=Характер сортировки
-CollationConnectionComment=Выберите страницу код, который определяет характер в сортировки используемых данных. Этот параметр называется также 'обобщение' некоторые базы данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
+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
+DBSortingCollation=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.
+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.

htdocs/langs/ru_RU/members.lang

@@ -198,7 +198,7 @@ LastSubscriptionDate=Последний день подписки
 LastSubscriptionAmount=Последняя сумма подписки
 MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
-MembersStatisticsByTowne=Члены статистики города
+MembersStatisticsByTown=Члены статистики города
 NbOfMembers=Количество членов
 NoValidatedMemberYet=Нет проверки члены найдены
 MembersByCountryDesc=Этот экран покажет вам статистику членов странами. Графический зависит однако от Google сервис график онлайн и доступна, только если подключение к Интернету работает.

htdocs/langs/ru_UA/install.lang

@@ -102,8 +102,8 @@ YouMustCreateItAndAllowServerToWrite=Вы должны создать эту д
 CharsetChoice=Выбор набора символов
 CharacterSetClient=Набор символов, используемый для сгенерированных HTML веб-страниц
 CharacterSetClientComment=Выберите набор символов для веба. <br/> По умолчанию предлагается набор символов является одним из базы данных.
-CollationConnection=Порядок сортировки символов
+DBSortingCollation=Порядок сортировки символов
-CollationConnectionComment=Выберите страницу код, который определяет порядок сортировки персонажа используются базы данных. Этот параметр также называется &quot;сортировки&quot; на некоторых базах данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
+DBSortingCollationComment=Выберите страницу код, который определяет порядок сортировки персонажа используются базы данных. Этот параметр также называется &quot;сортировки&quot; на некоторых базах данных. <br/> Этот параметр не может быть определен, если база данных уже существует.
 CharacterSetDatabase=Набор символов для базы данных
 KeepDefaultValuesWamp=Вы можете использовать мастер установки из Dolibarr DoliWamp, поэтому значения предлагаемых здесь уже оптимизированы. Изменение их, только если вы знаете, что вы делаете.
 KeepDefaultValuesDeb=Вы можете использовать мастер Dolibarr установки из Linux-пакет (Ubuntu, Debian, Fedora ...), поэтому значения предлагаемых здесь уже оптимизированы. Только пароль владельца базы данных для создания должны быть заполнены. Изменение других параметров, только если вы знаете что вы делаете.

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
+DBSortingCollation = 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.
+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>.

htdocs/langs/sl_SI/members.lang

@@ -167,7 +167,7 @@ LastSubscriptionDate = Zadnji datum članarine
 LastSubscriptionAmount = Zadnji znesek članarine
 MembersStatisticsByCountries = Statistika članov po državah
 MembersStatisticsByState = Statistika članov po deželah
-MembersStatisticsByTowne = Statistika članov po mestih
+MembersStatisticsByTown = Statistika članov po mestih
 NbOfMembers = Število članov
 NoValidatedMemberYet = Najdeni so nepotrjeni člani
 MembersByCountryDesc = Na tem zaslonu je prikazana statistika članov po državah. Grafika je odvisna od Google storitve in je na voljo samo pri delujoči internetni povezavi.

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
+DBSortingCollation=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.
+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.

htdocs/langs/sv_SE/members.lang

@@ -190,7 +190,7 @@ LastSubscriptionDate=Senast teckningsdag
 LastSubscriptionAmount=Senast teckningsbelopp
 MembersStatisticsByCountries=Medlemmar statistik per land
 MembersStatisticsByState=Medlemmar statistik från stat / provins
-MembersStatisticsByTowne=Medlemmar statistik per kommun
+MembersStatisticsByTown=Medlemmar statistik per kommun
 NbOfMembers=Antal medlemmar
 NoValidatedMemberYet=Inga godkända medlemmar hittades
 MembersByCountryDesc=Denna skärm visar statistik om medlemmar med länder. Grafisk beror dock på Google online grafen service och är tillgänglig endast om en Internet-anslutning fungerar.

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
+DBSortingCollation=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.
+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.

htdocs/langs/tr_TR/members.lang

@@ -180,7 +180,7 @@ LastSubscriptionAmount=Son abonelik tutarı
 "MembersStatisticsByCountries=Ülkelere göre üyelik istatistikleri
 "
 MembersStatisticsByState=Eyalete/ile göre üyelik istatistikleri
-MembersStatisticsByTowne=İlçelere göre üyelik istatistikleri
+MembersStatisticsByTown=İlçelere göre üyelik istatistikleri
 NbOfMembers=Üye sayısı
 NoValidatedMemberYet=Doğrulanmamış üye bulunmadı
 MembersByCountryDesc=Bu ekran ülkelere göre üyelik istatisklerini görüntüler. Grafik eğer internet hizmeti çalışıyor ise sadece  google çevrimiçi grafik hizmetince sağlanır.