Merge remote-tracking branch 'origin/3.7' into develop

Conflicts: htdocs/commande/class/commande.class.php htdocs/core/class/dolgraph.class.php htdocs/langs/en_AU/main.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/other.lang
2025-12-15 22:11:36 +01:00 · 2015-03-16 18:30:30 +01:00
parent daf853d040 04c88b0d94
commit 6d7b340cee
1156 changed files with 34590 additions and 3428 deletions
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = uz: uz_UZ
+lang_map = uz: uz_UZ, sw: sw_SW

 [dolibarr.accountancy]
 file_filter = htdocs/langs/<lang>/accountancy.lang
--- a/dev/fixaltlanguages.sh
+++ b/dev/fixaltlanguages.sh
@@ -32,13 +32,18 @@ then
    for dir in `find htdocs/langs/$3* -type d`
    do
    	dirshort=`basename $dir`
+    	
    	#echo $dirshort
    	
 		export aa=`echo $dirshort | nawk -F"_" '{ print $1 }'`
        export bb=`echo $dirshort | nawk -F"_" '{ print $2 }'`
        aaupper=`echo $dirshort | nawk -F"_" '{ print toupper($1) }'`
+        if [ $aaupper = "EN" ]
+        then
+        	aaupper="US"
+        fi
    	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
-    	if [ "$aa" != "$bblower" ]
+    	if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ]
    	then
    	    reflang="htdocs/langs/"$aa"_"$aaupper
    	    if [ -d $reflang ]
@@ -48,6 +53,15 @@ then
    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
    			for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done 
+    			for fic in `ls htdocs/langs/${aa}_${bb}/*.lang`; 
+    			do f=`cat $fic | wc -l`; 
+    			    #echo $f lines into file $fic; 
+    			    if [ $f = 1 ] 
+    			    then 
+    			        echo Only one line remainging into file $fic, we delete it;
+    			        rm $fic 
+    			    fi;
+    			done
    		fi
    	fi
    done;
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -60,6 +60,7 @@ $rc = 0;

 $lPrimary = isset($argv[1])?$argv[1]:'';
 $lSecondary = isset($argv[2])?$argv[2]:'';
+$lEnglish = 'en_US';
 $filesToProcess = isset($argv[3])?$argv[3]:'';

 if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess))
@@ -73,6 +74,7 @@ if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess))

 $aPrimary = array();
 $aSecondary = array();
+$aEnglish = array();

 // Define array $filesToProcess
 if ($filesToProcess == 'all')
@@ -96,6 +98,7 @@ foreach($filesToProcess as $fileToProcess)
 {
 	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
 	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
+	$lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess;
 	$output = $lSecondaryFile . '.delta';

 	print "---- Process language file ".$lSecondaryFile."\n";
@@ -114,6 +117,13 @@ foreach($filesToProcess as $fileToProcess)
 		continue;
 	}

+	if ( ! is_readable($lEnglishFile) ) {
+		$rc = 3;
+		$msg = "Cannot read english language file $lEnglishFile. We discard this file.";
+		print $msg . "\n";
+		continue;
+	}
+
 	// Start reading and parsing Secondary

 	if ( $handle = fopen($lSecondaryFile, 'r') )
@@ -172,6 +182,65 @@ foreach($filesToProcess as $fileToProcess)
 	}


+	// Start reading and parsing English
+
+	if ( $handle = fopen($lEnglishFile, 'r') )
+	{
+		print "Read English File $lEnglishFile:\n";
+		$cnt = 0;
+		while (($line = fgets($handle)) !== false)
+		{
+			$cnt++;
+
+			// strip comments
+			if ( preg_match("/^\w*#/", $line) ) {
+				continue;
+			}
+			// strip empty lines
+			if ( preg_match("/^\w*$/", $line) ) {
+				continue;
+			}
+
+			$a = mb_split('=', trim($line), 2);
+			if ( count($a) != 2 ) {
+				print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n";
+				continue;
+			}
+
+			list($key, $value) = $a;
+
+			// key is redundant
+			if ( array_key_exists($key, $aEnglish) ) {
+				print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n";
+				continue;
+			}
+
+			// String has no value
+			if ( $value == '' ) {
+				print "Key $key has no value in file $lEnglishFile (line: $cnt).\n";
+				continue;
+			}
+
+			$aEnglish[$key] = trim($value);
+		}
+		if ( ! feof($handle) )
+		{
+			$rc = 5;
+			$msg = "Unexpected fgets() fail";
+			print $msg . " (rc=$rc).\n";
+			exit($rc);
+		}
+		fclose($handle);
+	}
+	else {
+		$rc = 6;
+		$msg = "Cannot open file $lEnglishFile";
+		print $msg . " (rc=$rc).\n";
+		exit($rc);
+	}
+
+
+
 	// Start reading and parsing Primary. See rules in header!

 	$arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand');
@@ -246,7 +315,11 @@ foreach($filesToProcess as $fileToProcess)
 			}

 			// String exists in both files and does not match
-			if ((! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]) || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key))
+			if (
+				(! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
+			    && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
+				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)
+				)
 			{
 				//print "Key $key differs so we add it into new secondary language (line: $cnt).\n";
 				fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n");
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -13,7 +13,7 @@ then
 	echo "This pull remote transifex files to local dir."
 	echo "Note:  If you pull a language file (not source), file will be skipped if local file is newer."
 	echo "       Using -f will overwrite local file (does not work with 'all')."
-	echo "Usage: ./dev/translation/txpull.sh (all|xx_XX) [-r dolibarr.file] [-f]"
+	echo "Usage: ./dev/translation/txpull.sh (all|xx_XX) [-r dolibarr.file] [-f] [-s]"
 	exit
 fi

@@ -26,13 +26,21 @@ fi

 if [ "x$1" = "xall" ]
 then
-	for fic in ar_SA bg_BG bs_BA ca_ES cs_CZ da_DK de_DE el_GR es_ES et_EE eu_ES fa_IR fi_FI fr_FR he_IL hr_HR hu_HU id_ID is_IS it_IT ja_JP ka_GE ko_KR lt_LT lv_LV mk_MK nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sk_SK sl_SI sq_AL sv_SE th_TH tr_TR uk_UA uz_UZ vi_VN zh_CN zh_TW
+    cd htdocs/lang
+	for dir in `find htdocs/langs/* -type d`
 	do
+	    fic=`basename $dir`
+	    if [ $fic != "en_US" ]
+	    then
 		    echo "tx pull -l $fic $2 $3"
 		    tx pull -l $fic $2 $3
+		fi
 	done
+	cd -
 else
-	echo "tx pull -l $1 $2 $3 $4"
-	tx pull -l $1 $2 $3 $4
+	echo "tx pull -l $1 $2 $3 $4 $5"
+	tx pull -l $1 $2 $3 $4 $5
 fi

+echo Think to launch also: 
+echo "> dev/fixaltlanguages.sh fix all"
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -229,7 +229,7 @@ $sql.= ", note";
 $sql.= ", entity";
 $sql.= " FROM ".MAIN_DB_PREFIX."const";
 $sql.= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
-if (empty($user->entity) && $debug) {} // to force for superadmin
+if ((empty($user->entity) || $user->admin) && $debug) {} // to force for superadmin
 else $sql.= " AND visible = 1";			// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
 $sql.= " ORDER BY entity, name ASC";

--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -111,6 +111,11 @@ class Commande extends CommonOrder
 	var $location_incoterms;
 	var $libelle_incoterms;  //Used into tooltip

+    // Pour board
+    var $nbtodo;
+    var $nbtodolate;
+
+
     /**
     * ERR Not engouch stock
     */
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -65,7 +65,7 @@ class DolGraph
 	var $bgcolorgrid=array(255,255,255);			// array(R,G,B)
 	var $datacolor;				// array(array(R,G,B),...)

-	protected $stringtoshow;      // To store string to output graph into HTML page
+	private $_stringtoshow;      // To store string to output graph into HTML page


 	/**
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2495,7 +2495,7 @@ function dol_print_error($db='',$error='')
 	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
 	{
 		$out.=$langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $out.="You use an experimental level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $out.="You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
 		$out.=$langs->trans("InformationToHelpDiagnose").":<br>\n";

 		$out.="<b>".$langs->trans("Date").":</b> ".dol_print_date(time(),'dayhourlog')."<br>\n";
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';


 /**
@@ -77,6 +78,7 @@ class pdf_baleine extends ModelePDFProjects
 		// Defini position des colonnes
 		$this->posxref=$this->marge_gauche+1;
 		$this->posxlabel=$this->marge_gauche+25;
+		$this->posxworkload=$this->marge_gauche+100;
 		$this->posxprogress=$this->marge_gauche+140;
 		$this->posxdatestart=$this->marge_gauche+150;
 		$this->posxdateend=$this->marge_gauche+170;
@@ -216,20 +218,22 @@ class pdf_baleine extends ModelePDFProjects
 					$progress=$object->lines[$i]->progress.'%';
 					$datestart=dol_print_date($object->lines[$i]->date_start,'day');
 					$dateend=dol_print_date($object->lines[$i]->date_end,'day');
-
+					$planned_workload=convertSecondToTime($object->lines[$i]->planned_workload,'allhourmin');

 					$pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page

 					$pdf->SetXY($this->posxref, $curY);
-					$pdf->MultiCell(60, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
+					$pdf->MultiCell($this->posxlabel-$this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
 					$pdf->SetXY($this->posxlabel, $curY);
-					$pdf->MultiCell(108, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+					$pdf->MultiCell($this->posxworkload-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+					$pdf->SetXY($this->posxworkload, $curY);
+					$pdf->MultiCell($this->posxprogress-$this->posxworkload, 3, $planned_workload, 0, 'R');
 					$pdf->SetXY($this->posxprogress, $curY);
-					$pdf->MultiCell(16, 3, $progress, 0, 'L');
+					$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, $progress, 0, 'R');
 					$pdf->SetXY($this->posxdatestart, $curY);
-					$pdf->MultiCell(20, 3, $datestart, 0, 'L');
+					$pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $datestart, 0, 'C');
 					$pdf->SetXY($this->posxdateend, $curY);
-					$pdf->MultiCell(20, 3, $dateend, 0, 'L');
+					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxdateend, 3, $dateend, 0, 'C');


 					$pageposafter=$pdf->getPage();
@@ -362,8 +366,23 @@ class pdf_baleine extends ModelePDFProjects
 		$pdf->SetTextColor(0,0,0);
 		$pdf->SetFont('','', $default_font_size);

-		$pdf->SetXY($this->posxref-1, $tab_top+2);
-		$pdf->MultiCell(80,2, $outputlangs->transnoentities("Tasks"),'','L');
+		$pdf->SetXY($this->posxref, $tab_top+1);
+		$pdf->MultiCell($this->posxlabel-$this->posxref,3, $outputlangs->transnoentities("Tasks"),'','L');
+
+		$pdf->SetXY($this->posxlabel, $tab_top+1);
+		$pdf->MultiCell($this->posxworkload-$this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
+
+		$pdf->SetXY($this->posxworkload, $tab_top+1);
+		$pdf->MultiCell($this->posxprogress-$this->posxworkload, 3, $outputlangs->transnoentities("PlannedWorkloadShort"), 0, 'R');
+
+		$pdf->SetXY($this->posxprogress, $tab_top+1);
+		$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, '%', 0, 'R');
+
+		$pdf->SetXY($this->posxdatestart, $tab_top+1);
+		$pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, '', 0, 'C');
+
+		$pdf->SetXY($this->posxdateend, $tab_top+1);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');

 	}

--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -45,8 +45,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	function __construct()
 	{
 	    global $conf;
-		if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (empty($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
+        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
 		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
 	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -337,13 +337,15 @@ class Export
 	/**
 	 *      Build an input field used to filter the query
 	 *
-	 *      @param		string	$TypeField		Type of Field to filter
+	 *      @param		string	$TypeField		Type of Field to filter. Example: Text, List:c_country:label:rowid, List:c_stcom:label:code, Number, Boolean
 	 *      @param		string	$NameField		Name of the field to filter
 	 *      @param		string	$ValueField		Initial value of the field to filter
 	 *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
 	 */
 	function build_filterField($TypeField, $NameField, $ValueField)
 	{
+		global $langs;
+		
 		$szFilterField='';
 		$InfoFieldList = explode(":", $TypeField);

@@ -354,7 +356,7 @@ class Export
 			case 'Date':
 			case 'Duree':
 			case 'Numeric':
-				$szFilterField='<input type="text" name='.$NameField." value='".$ValueField."'>";
+				$szFilterField='<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Boolean':
 				$szFilterField='<select name="'.$NameField.'" class="flat">';
@@ -375,12 +377,14 @@ class Export
 				// 0 : Type du champ
 				// 1 : Nom de la table
 				// 2 : Nom du champ contenant le libelle
-				// 3 : Nom du champ contenant la cle (si different de rowid)
+				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
 				if (count($InfoFieldList)==4)
 					$keyList=$InfoFieldList[3];
 				else
 					$keyList='rowid';
-				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2];
+				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
 				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];

 				$resql = $this->db->query($sql);
@@ -396,14 +400,25 @@ class Export
 						while ($i < $num)
 						{
 							$obj = $this->db->fetch_object($resql);
-							if ($obj->$InfoFieldList[2] == '-')
+							if ($obj->label == '-')
 							{
 								// Discard entry '-'
 								$i++;
 								continue;
 							}
-
-							$labeltoshow=dol_trunc($obj->$InfoFieldList[2],18);
+							//var_dump($InfoFieldList[1]);
+							$labeltoshow=dol_trunc($obj->label,18);
+							if ($InfoFieldList[1] == 'c_stcomm') 
+							{
+								$langs->load("companies");
+								$labeltoshow=(($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id)?$langs->trans("StatusProspect".$obj->id):$obj->label);
+							}
+							if ($InfoFieldList[1] == 'c_country') 
+							{
+								//var_dump($sql);
+								$langs->load("dict");
+								$labeltoshow=(($langs->trans("Country".$obj->code) != "Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label);
+							}
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
 								$szFilterField.='<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.'</option>';
@@ -417,8 +432,9 @@ class Export
 					}
 					$szFilterField.="</select>";

-					$this->db->free();
+					$this->db->free($resql);
 				}
+				else dol_print_error($this->db);
 				break;
 		}

--- a/htdocs/install/mysql/data/llx_c_stcomm.sql
+++ b/htdocs/install/mysql/data/llx_c_stcomm.sql
@@ -31,8 +31,8 @@
 --

 delete from llx_c_stcomm;
-insert into llx_c_stcomm (id,code,libelle) values (-1, 'ST_NO',    'Ne pas contacter');
-insert into llx_c_stcomm (id,code,libelle) values ( 0, 'ST_NEVER', 'Jamais contacté');
-insert into llx_c_stcomm (id,code,libelle) values ( 1, 'ST_TODO',  'A contacter');
-insert into llx_c_stcomm (id,code,libelle) values ( 2, 'ST_PEND',  'Contact en cours');
-insert into llx_c_stcomm (id,code,libelle) values ( 3, 'ST_DONE',  'Contactée');
+insert into llx_c_stcomm (id,code,libelle) values (-1, 'ST_NO',    'Do not contact');
+insert into llx_c_stcomm (id,code,libelle) values ( 0, 'ST_NEVER', 'Never contacted');
+insert into llx_c_stcomm (id,code,libelle) values ( 1, 'ST_TODO',  'To contact');
+insert into llx_c_stcomm (id,code,libelle) values ( 2, 'ST_PEND',  'Contact in progress');
+insert into llx_c_stcomm (id,code,libelle) values ( 3, 'ST_DONE',  'Contacted');
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=تجريبية
 VersionDevelopment=تطويرية
 VersionUnknown=غير معروفة
 VersionRecommanded=موصى بها
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=رمز المرحلة
 SessionSaveHandler=معالج لحفظ المراحل
 SessionSavePath=مرحلة التخزين المحلية
@@ -493,10 +498,16 @@ Module600Name=الإخطارات
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=فرس النبي
 Module1200Desc=فرس النبي التكامل
 Module1400Name=المحاسبة
 Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
 Module1780Name=الفئات
 Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن)
 Module2000Name=Fckeditor
@@ -631,7 +642,7 @@ Permission181=قراءة مورد أوامر
 Permission182=إنشاء / تغيير المورد أوامر
 Permission183=صحة أوامر المورد
 Permission184=الموافقة على أوامر المورد
-Permission185=من أجل المورد أوامر
+Permission185=Order or cancel supplier orders
 Permission186=تلقي أوامر المورد
 Permission187=وثيقة أوامر المورد
 Permission188=المورد إلغاء أوامر
@@ -711,6 +722,13 @@ Permission538=تصدير الخدمات
 Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
+Permission771=Read expense reports (own and his subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
 Permission1001=قراءة مخزونات
 Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=كلمة مرور لاستخدام الملقم الوكيل
 DefineHereComplementaryAttributes=هنا تعريف جميع atributes، لا تتوفر بالفعل افتراضيا، والتي تريد أن تدعم ل%s.
 ExtraFields=تكميلية سمات
 ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
 ExtraFieldsContacts=Complementary attributes (contact/address)
 ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات ا
 FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### AskPriceSupplier #####
+AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierNumberingModules=Price requests suppliers numbering models
+AskPriceSupplierPDFModules=Price requests suppliers documents models
+FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
+WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
 ##### Orders #####
 OrdersSetup=أوامر إدارة الإعداد
 OrdersNumberingModules=أوامر الترقيم نمائط
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=الباركود نوع من اتحاد الوطنيين الكو
 BarcodeDescISBN=الباركود من نوع ردمك
 BarcodeDescC39=الباركود من نوع C39
 BarcodeDescC128=الباركود من نوع C128
-GenbarcodeLocation=باركود الجيل سطر أداة تستخدمها phpbarcode المحرك لبعض أنواع باركود)
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع
 CashDeskBankAccountForCheque= حساب لاستخدام لتلقي المدفوعات عن طريق الشيكات
 CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=إعداد وحدة المرجعية
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
 IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
 Reconciliation=المصالحة
 RIB=رقم الحساب المصرفي
 IBAN=عدد إيبان
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
 BIC=بيك / سويفت عدد
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
 StandingOrders=أوامر دائمة
 StandingOrder=من أجل الوقوف
 Withdrawals=انسحابات
@@ -148,7 +152,7 @@ BackToAccount=إلى حساب
 ShowAllAccounts=وتبين للجميع الحسابات
 FutureTransaction=الصفقة في أجل المستقبل. أي وسيلة للتوفيق.
 SelectChequeTransactionAndGenerate=حدد / تصفية الشيكات لتشمل في الاختيار استلام الودائع وانقر على &quot;إنشاء&quot;.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To conciliate?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -9,9 +9,9 @@ Prospect=احتمال
 Prospects=آفاق
 DeleteAction=حذف عمل / المهمة
 NewAction=عمل جديدة / المهمة
-AddAction=أضف العمل / المهمة
-AddAnAction=إضافة عمل / المهمة
-AddActionRendezVous=إضافة مهمة رانديفو
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
 Rendez-Vous=الموعد
 ConfirmDeleteAction=هل أنت متأكد من أنك تريد حذف هذه المهمة؟
 CardAction=بطاقة العمل
@@ -44,8 +44,8 @@ DoneActions=إجراءات عمله
 DoneActionsFor=إجراءات لعمله ق ٪
 ToDoActions=عدم اكتمال الإجراءات
 ToDoActionsFor=لعدم اكتمال الإجراءات ق ٪
-SendPropalRef=اقتراح ارسال التجارية ق ٪
-SendOrderRef=من أجل إرسال المستندات ٪
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
 StatusNotApplicable=لا ينطبق
 StatusActionToDo=القيام
 StatusActionDone=فعل
@@ -62,7 +62,7 @@ LastProspectContactDone=الاتصال به
 DateActionPlanned=تاريخ العمل المزمع
 DateActionDone=تاريخ العمل به
 ActionAskedBy=طلبت العمل
-ActionAffectedTo=العمل على المتضررين
+ActionAffectedTo=Event assigned to
 ActionDoneBy=العمل الذي قام به
 ActionUserAsk=التي سجلتها
 ErrorStatusCantBeZeroIfStarted=إذا كان المجال <b>'تاريخ عمله</b> هو شغلها ، وبدأ العمل (أو انتهت) ، وذلك الميدان' <b>الحالة</b> 'لا يمكن أن يكون 0 ٪ ٪.
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=انتهى
 ServiceStatusClosed=مغلقة
 ServicesLegend=خدمات أسطورة
 Contracts=عقود
+ContractsAndLine=Contracts and line of contracts
 Contract=العقد
 NoContracts=أي عقود
 MenuServices=الخدمات
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=المصدر والأهداف يجب أن تكو
 ErrorBadThirdPartyName=سوء قيمة اسم طرف ثالث
 ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=سوء تركيب الزبون مدونة
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=رمز العميل المطلوبة
 ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=الشفرة المستخدمة بالفعل العملاء
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=يجب عدم تعطيل جافا سكريبت لج
 ErrorPasswordsMustMatch=ويجب على كلا كلمات المرور المكتوبة تطابق بعضها البعض
 ErrorContactEMail=وقع خطأ فني. من فضلك، اتصل بمسؤول إلى البريد الإلكتروني بعد <b>%s</b> EN توفير <b>%s</b> رمز الخطأ في رسالتك، أو حتى أفضل من خلال إضافة نسخة شاشة من هذه الصفحة.
 ErrorWrongValueForField=قيمة خاطئة لعدد <b>%s</b> الحقل (قيمة <b>'%s'</b> لا يتطابق <b>%s</b> حكم [رجإكس])
-ErrorFieldValueNotIn=قيمة خاطئة <b>ل%s</b> عدد حقل <b>('%s</b> &quot;قيمة ليست قيمة المتاحة في مجال <b>%s %s</b> الجدول)
+ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
 ErrorFieldRefNotIn=قيمة خاطئة <b>ل%s</b> عدد حقل <b>('%s</b> &quot;قيمة ليست المرجع <b>%s</b> موجود)
 ErrorsOnXLines=الأخطاء على خطوط مصدر <b>%s</b>
 ErrorFileIsInfectedWithAVirus=وكان برنامج مكافحة الفيروسات غير قادرة على التحقق من صحة الملف (ملف قد يكون مصابا بواسطة فيروس)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action

 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=<strong>الخطوة الأخيرة</strong> : تعريف المس
 ActivateModule=تفعيل وحدة %s
 ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)

 #########
 # upgrade
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -141,6 +141,7 @@ Cancel=الغاء
 Modify=تعديل
 Edit=تحرير
 Validate=صحة
+ValidateAndApprove=Validate and Approve
 ToValidate=للمصادقة
 Save=حفظ
 SaveAs=حفظ باسم
@@ -158,6 +159,7 @@ Search=بحث
 SearchOf=البحث
 Valid=صحيح
 Approve=الموافقة
+Disapprove=Disapprove
 ReOpen=إعادة فتح
 Upload=ارسال الملف
 ToLink=Link
@@ -219,6 +221,7 @@ Cards=بطاقات
 Card=بطاقة
 Now=الآن
 Date=تاريخ
+DateAndHour=Date and hour
 DateStart=تاريخ البدء
 DateEnd=نهاية التاريخ
 DateCreation=تاريخ الإنشاء
@@ -295,6 +298,7 @@ UnitPriceHT=سعر الوحدة (صافي)
 UnitPriceTTC=سعر الوحدة
 PriceU=ارتفاع
 PriceUHT=ارتفاع (صافي)
+AskPriceSupplierUHT=P.U. HT Requested
 PriceUTTC=ارتفاع
 Amount=مبلغ
 AmountInvoice=مبلغ الفاتورة
@@ -521,6 +525,7 @@ DateFromTo=ل٪ من ق ق ٪
 DateFrom=من ق ٪
 DateUntil=حتى ق ٪
 Check=فحص
+Uncheck=Uncheck
 Internal=الداخلية
 External=الخارجية
 Internals=الداخلية
@@ -688,6 +693,7 @@ PublicUrl=Public URL
 AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
+ShowTransaction=Show transaction
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=ألغى
 StatusOrderDraft=مشروع (لا بد من التحقق من صحة)
 StatusOrderValidated=صادق
 StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
 StatusOrderProcessed=تجهيز
 StatusOrderToBill=على مشروع قانون
 StatusOrderToBill2=على مشروع قانون
@@ -58,6 +59,7 @@ MenuOrdersToBill=أوامر لمشروع قانون
 MenuOrdersToBill2=Billable orders
 SearchOrder=من أجل البحث
 SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
 ShipProduct=سفينة المنتج
 Discount=الخصم
 CreateOrder=خلق أمر
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -54,12 +54,13 @@ MaxSize=الحجم الأقصى
 AttachANewFile=إرفاق ملف جديد / وثيقة
 LinkedObject=ربط وجوه
 Miscellaneous=متفرقات
-NbOfActiveNotifications=عدد الإخطارات
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=هذا هو الاختبار الإلكتروني. تكون مفصولة \\ nThe سطرين من قبل حرف إرجاع.
 PredefinedMailTestHtml=هذا هو البريد <b>الاختبار</b> (الاختبار يجب أن تكون في كلمة جريئة). <br> وتفصل بين الخطين من قبل حرف إرجاع.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
 l_eatby=Eat-by date
 l_sellby=Sell-by date
 DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Batch: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceMode=Price mode
 PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -8,8 +8,10 @@ SharedProject=مشاريع مشتركة
 PrivateProject=اتصالات من المشروع
 MyProjectsDesc=ويقتصر هذا الرأي على المشاريع التي تقوم على الاتصال (كل ما هو نوع).
 ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=ويعرض هذا الرأي جميع المشاريع (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 MyTasksDesc=ويقتصر هذا الرأي على المشروعات أو المهام التي هي الاتصال للحصول على (ما هو نوع).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة.
 TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 ProjectsArea=مشاريع المنطقة
@@ -29,6 +31,8 @@ NoProject=لا يعرف أو المملوكة للمشروع
 NbOpenTasks=ملاحظة : من مهام فتح
 NbOfProjects=ملاحظة : للمشاريع
 TimeSpent=الوقت الذي تستغرقه
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
 TimesSpent=قضى وقتا
 RefTask=المرجع. مهمة
 LabelTask=علامة مهمة
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=قائمة الموردين الأوامر
 ListSupplierInvoicesAssociatedProject=قائمة الموردين المرتبطة بالمشروع.
 ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع.
 ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع
-ListTripAssociatedProject=قائمة من الرحلات والنفقات المرتبطة بالمشروع
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع
 ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
 ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
@@ -133,3 +137,6 @@ SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
 Salary=Salary
 Salaries=Salaries
 Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=الكمية أمرت
 QtyShipped=الكمية المشحونة
 QtyToShip=لشحن الكمية
 QtyReceived=الكمية الواردة
-KeepToShip=إبقاء لشحن
+KeepToShip=Remain to ship
 OtherSendingsForSameOrder=الإرسال الأخرى لهذا النظام
 DateSending=وحتى الآن من أجل إرسال
 DateSendingShort=وحتى الآن من أجل إرسال
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=المتوسط المرجح لسعر
 PMPValueShort=الواب
 EnhancedValueOfWarehouses=قيمة المستودعات
 UserWarehouseAutoCreate=خلق مخزون تلقائيا عند إنشاء مستخدم
+IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=ارسال كمية
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decreas
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
 ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=الموردين
-Supplier=المورد
 AddSupplier=Create a supplier
 SupplierRemoved=إزالة المورد
 SuppliersInvoice=فاتورة الموردين
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=فواتير الموردين والمدفوعات
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=الموافقة على هذا النظام
 ConfirmApproveThisOrder=هل أنت متأكد من أن يوافق على هذا الأمر؟
-DenyingThisOrder=ونفى هذا الأمر
+DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=هل أنت متأكد من إنكار هذا الأمر؟
 ConfirmCancelThisOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟
 AddCustomerOrder=العملاء من أجل خلق
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -1,22 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=رحلة
-Trips=رحلات
-TripsAndExpenses=ونفقات الرحلات
-TripsAndExpensesStatistics=رحلات ونفقات إحصاءات
-TripCard=بطاقة زيارة
-AddTrip=إضافة رحلة
-ListOfTrips=قائمة الرحلات
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
 ListOfFees=قائمة الرسوم
-NewTrip=رحلة جديدة
+NewTrip=New expense report
 CompanyVisited=الشركة / المؤسسة زارت
 Kilometers=كم
 FeesKilometersOrAmout=كم المبلغ أو
-DeleteTrip=رحلة حذف
-ConfirmDeleteTrip=هل أنت متأكد من أنك تريد حذف هذه الرحلة؟
-TF_OTHER=أخرى
-TF_LUNCH=غداء
-TF_TRIP=رحلة
-ListTripsAndExpenses=قائمة الرحلات والمصاريف
-ExpensesArea=رحلات ومنطقة النفقات
-SearchATripAndExpense=بحث عن رحلة والنفقات
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
 ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=أخرى
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=غداء
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Експериментален
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестен
 VersionRecommanded=Препоръчва се
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=ID на сесията
 SessionSaveHandler=Handler за да запазите сесията
 SessionSavePath=Място за съхранение на сесията
@@ -294,7 +299,7 @@ DoNotUseInProduction=Не използвайте на продукшън пла
 ThisIsProcessToFollow=Това е настройка на процеса:
 StepNb=Стъпка %s
 FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Изтегляне на пакет %s.
 UnpackPackageInDolibarrRoot=Разопаковайте пакет файл в главната директория <b>%s</b> Dolibarr
 SetupIsReadyForUse=Install е завършен и Dolibarr е готов за използване с този нов компонент.
 NotExistsDirect=Алтернатива главната директория не е дефинирано. <br>
@@ -311,7 +316,7 @@ GenericMaskCodes3=Всички други символи на маската щ
 GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Пример за трета страна е създаден на 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Пример за продукт, създаден на 2007-03-01:</u> <br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ще даде <b>ABC0701-000099</b> <br> <b>{0000+100@1}-ZZZ/{dd} / XXX</b> ще даде <b>0199-ZZZ/31/XXX</b>
 GenericNumRefModelDesc=Върнете адаптивни номер според определен маска.
 ServerAvailableOnIPOrPort=Сървър е достъпна на адрес <b>%s</b> на порт <b>%s</b>
 ServerNotAvailableOnIPOrPort=Сървърът не е достъпен на адрес <b>%s</b> на порт <b>%s</b>
@@ -335,7 +340,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Файлове. Lang заредени
 ExamplesWithCurrentSetup=Примери с текущата настройка
 ListOfDirectories=Списък на OpenDocument директории шаблони
 ListOfDirectoriesForModelGenODT=Списък на директории, съдържащи шаблони файлове с OpenDocument формат. <br><br> Тук можете да въведете пълния път на директории. <br> Добави за връщане между указател ие. <br> За да добавите директория на GED модул, добавете тук на <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> Файлове в тези директории, трябва да завършва <b>с. ODT.</b>
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+NumberOfModelFilesFound=Брой на ODT файлове шаблони, намерени в тези директории
 ExampleOfDirectoriesForModelGen=Примери на синтаксиса: <br> C: \\ mydir <br> / Начало / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> За да разберете как да създадете свои ODT шаблони на документи, преди да ги съхранявате в тези указатели, прочетете уики документация:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -369,19 +374,19 @@ NewVATRates=Нов ставка на ДДС
 PriceBaseTypeToChange=Промяна на цените с база референтна стойност, определена на
 MassConvert=Стартиране маса конвертирате
 String=Низ
-TextLong=Long text
-Int=Integer
-Float=Float
+TextLong=Дълъг текст
+Int=Цяло число
+Float=Десетично число
 DateAndTime=Дата и час
-Unique=Unique
-Boolean=Boolean (Checkbox)
+Unique=Уникално
+Boolean=Логическо (Отметка)
 ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
 ExtrafieldMail = Имейл
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldCheckBox=Checkbox
+ExtrafieldSelect = Избор лист
+ExtrafieldSelectList = Избор от таблица
+ExtrafieldSeparator=Разделител
+ExtrafieldCheckBox=Отметка
 ExtrafieldRadio=Радио бутон
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
@@ -389,16 +394,16 @@ ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> fo
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
+LibraryToBuildPDF=Библиотека използвана за направа на PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+RefreshPhoneLink=Обнови връзка
+LinkToTest=Генерирана е връзка за потребител <strong>%s</strong> (натиснете телефонния номер за тест)
+KeepEmptyToUseDefault=Оставете празно за стойност по подразбиране
+DefaultLink=Връзка по подразбиране
+ValueOverwrittenByUserSetup=Внимание, тази стойност може да бъде презаписана от потребителски настройки (всеки потребител може да зададе собствен натисни-набери адрес)
 ExternalModule=Външен модул - инсталиран в директория %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
@@ -443,8 +448,8 @@ Module52Name=Запаси
 Module52Desc=Управление на склад (продукти)
 Module53Name=Услуги
 Module53Desc=Управление на услуги
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Договори/Абонаменти
+Module54Desc=Управление на договори (услуги или абонаменти)
 Module55Name=Баркодове
 Module55Desc=Управление на баркод
 Module56Name=Телефония
@@ -481,7 +486,7 @@ Module320Name=RSS емисия
 Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
 Module330Name=Отметки
 Module330Desc=Управление на отметки
-Module400Name=Projects/Opportunities/Leads
+Module400Name=Проекти/Възможности
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
@@ -493,10 +498,16 @@ Module600Name=Известия
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Дарения
 Module700Desc=Управление на дарения
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Богомолка
 Module1200Desc=Mantis интеграция
 Module1400Name=Счетоводство
 Module1400Desc=Управление на счетоводство (двойни страни)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
 Module1780Name=Категории
 Module1780Desc=Управление на категории (продукти, доставчици и клиенти)
 Module2000Name=WYSIWYG редактор
@@ -631,7 +642,7 @@ Permission181=Доставчика поръчки
 Permission182=Създаване / промяна на доставчика поръчки
 Permission183=Проверка на доставчика поръчки
 Permission184=Одобряване на доставчика поръчки
-Permission185=Поръчка доставчика поръчки
+Permission185=Order or cancel supplier orders
 Permission186=Получаване на доставчика поръчки
 Permission187=Близки поръчки доставчици
 Permission188=Отказ доставчика поръчки
@@ -711,6 +722,13 @@ Permission538=Износ услуги
 Permission701=Прочети дарения
 Permission702=Създаване / промяна на дарения
 Permission703=Изтриване на дарения
+Permission771=Read expense reports (own and his subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
 Permission1001=Прочети запаси
 Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Парола, за да използвате прокси сър
 DefineHereComplementaryAttributes=Определете тук всички atributes, не е налична по подразбиране, и че искате да се поддържа за %s.
 ExtraFields=Допълнителни атрибути
 ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
 ExtraFieldsContacts=Complementary attributes (contact/address)
 ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Линия на продукт / услуга с ну
 FreeLegalTextOnProposal=Свободен текст на търговски предложения
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### AskPriceSupplier #####
+AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierNumberingModules=Price requests suppliers numbering models
+AskPriceSupplierPDFModules=Price requests suppliers documents models
+FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
+WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
 ##### Orders #####
 OrdersSetup=Настройки за управление на поръчки
 OrdersNumberingModules=Поръчки номериране модули
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Баркод от тип UPC
 BarcodeDescISBN=Баркод от тип ISBN
 BarcodeDescC39=Баркод от типа С39
 BarcodeDescC128=Баркод от тип C128
-GenbarcodeLocation=Бар код поколение инструмент за командния ред (използва се от двигател с вътрешно за някои видове баркод)
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания
 CashDeskBankAccountForCheque= Акаунт по подразбиране да се използва за получаване на плащания с чек
 CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Bookmark настройка модул
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
 IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
 Reconciliation=Помирение
 RIB=Номер на банкова сметка
 IBAN=IBAN номер
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT номер
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
 StandingOrders=Постоянни поръчки
 StandingOrder=Постоянна поръчка
 Withdrawals=Тегления
@@ -148,7 +152,7 @@ BackToAccount=Обратно към сметка
 ShowAllAccounts=Покажи за всички сметки
 FutureTransaction=Транзакция в FUTUR. Няма начин за помирение.
 SelectChequeTransactionAndGenerate=Изберете / филтрирате проверки, за да се включи в проверка за получаването на депозит и кликнете върху &quot;Създаване&quot;.
-InputReceiptNumber=Изберете банково извлечение, свързани с процедурата по съгласуване. Използвайте подреждане числова стойност (като YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=В крайна сметка, да посочите категорията, в която да се класифицират записи
 ToConciliate=За помирение?
 ThenCheckLinesAndConciliate=След това проверете линии в отчета на банката и кликнете
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -12,13 +12,14 @@ BoxLastProspects=Последно променени prospects
 BoxLastCustomers=Последно променени клиенти
 BoxLastSuppliers=Последно променени доставчици
 BoxLastCustomerOrders=Последни поръчки на клиентите
+BoxLastValidatedCustomerOrders=Последни проверени клиентски поръчки
 BoxLastBooks=Последни книги
 BoxLastActions=Последни действия
 BoxLastContracts=Последните договори
 BoxLastContacts=Последните контакти/адреси
 BoxLastMembers=Последните членове
 BoxFicheInter=Последните намеси
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Открити сметки баланс
 BoxSalesTurnover=Оборот от продажби
 BoxTotalUnpaidCustomerBills=Общо неплатени фактури на клиента
 BoxTotalUnpaidSuppliersBills=Общо неплатени фактури на доставчика
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Брой клиенти
 BoxTitleLastRssInfos=Последните %s новини от %s
 BoxTitleLastProducts=Последните %s променени продукти/услуги
 BoxTitleProductsAlertStock=Предупреждение за наличност на продукти
-BoxTitleLastCustomerOrders=Последните %s променени поръчки от клиенти
+BoxTitleLastCustomerOrders=Последни %s поръчки на клиенти
+BoxTitleLastModifiedCustomerOrders=Последни %s променени клиентски поръчки
 BoxTitleLastSuppliers=Последните %s записани доставчици
 BoxTitleLastCustomers=Последните %s записани клиенти
 BoxTitleLastModifiedSuppliers=Последните %s променени доставчици
 BoxTitleLastModifiedCustomers=Последните %s променени клиенти
-BoxTitleLastCustomersOrProspects=Последните %s променени клиенти или prospects
-BoxTitleLastPropals=Последните %s записани предложения
+BoxTitleLastCustomersOrProspects=Последни %s клиенти или потенциални
+BoxTitleLastPropals=Последни %s предложения
+BoxTitleLastModifiedPropals=Последни %s променени предложения
 BoxTitleLastCustomerBills=Последните %s фактури на клиента
+BoxTitleLastModifiedCustomerBills=Последни %s променени клиентски фактури
 BoxTitleLastSupplierBills=Последните %s фактури на доставчика
-BoxTitleLastProspects=Последните %s записани prospects
+BoxTitleLastModifiedSupplierBills=Последни %s променени фактури от доставчик
 BoxTitleLastModifiedProspects=Последните %s променени prospects
 BoxTitleLastProductsInContract=Последните %s продукти / услуги в договора
-BoxTitleLastModifiedMembers=Последните %s променени членове
+BoxTitleLastModifiedMembers=Последни %s членове
 BoxTitleLastFicheInter=Последните %s променени intervention
-BoxTitleOldestUnpaidCustomerBills=Старите %s неплатени фактури на клиента
-BoxTitleOldestUnpaidSupplierBills=Старите %s неплатени фактури на доставчика
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleOldestUnpaidCustomerBills=Най-стари %s неплатени клиентски фактури
+BoxTitleOldestUnpaidSupplierBills=Най-стари %s неплатени фактури доставчик
+BoxTitleCurrentAccounts=Открити сметки баланси
 BoxTitleSalesTurnover=Оборот от продажби
-BoxTitleTotalUnpaidCustomerBills=Неплатени фактури на клиента
-BoxTitleTotalUnpaidSuppliersBills=Неплатени фактури на доставчика
+BoxTitleTotalUnpaidCustomerBills=Неплатени клиентски фактури
+BoxTitleTotalUnpaidSuppliersBills=Неплатени доставни фактури
 BoxTitleLastModifiedContacts=Последните %s променени контакти/адреси
 BoxMyLastBookmarks=Последните ми %s отметки
 BoxOldestExpiredServices=Най-старите действащи изтекли услуги
@@ -74,18 +78,19 @@ NoRecordedProducts=Няма регистрирани продукти / услу
 NoRecordedProspects=Няма регистрирани перспективи
 NoContractedProducts=Няма договорени продукти / услуги
 NoRecordedContracts=Няма регистрирани договори
-NoRecordedInterventions=No recorded interventions
+NoRecordedInterventions=Няма записани намеси
 BoxLatestSupplierOrders=Последни поръчки доставчика
-BoxTitleLatestSupplierOrders=%s новите поръчки доставчика
+BoxTitleLatestSupplierOrders=Последни %s поръчки за доставка
+BoxTitleLatestModifiedSupplierOrders=Последни %s променени поръчки от доставчик
 NoSupplierOrder=Не са познати доставчик за
-BoxCustomersInvoicesPerMonth=Customer invoices per month
-BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-BoxCustomersOrdersPerMonth=Customer orders per month
-BoxSuppliersOrdersPerMonth=Supplier orders per month
-BoxProposalsPerMonth=Proposals per month
+BoxCustomersInvoicesPerMonth=Клиентски фактури за месец
+BoxSuppliersInvoicesPerMonth=Доставчик фактури за месец
+BoxCustomersOrdersPerMonth=Клиентски заявки за месец
+BoxSuppliersOrdersPerMonth=Доставчик поръчки за месец
+BoxProposalsPerMonth=Предложения за месец
 NoTooLowStockProducts=Няма продукт в наличност под минималната
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
+BoxProductDistribution=Продукти/Услуги разпределение
+BoxProductDistributionFor=Разпределение на %s за %s
 ForCustomersInvoices=Клиента фактури
-ForCustomersOrders=Customers orders
+ForCustomersOrders=Клиентски поръчки
 ForProposals=Предложения
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -12,7 +12,7 @@ CashDeskProducts=Продукти
 CashDeskStock=Наличност
 CashDeskOn=на
 CashDeskThirdParty=Трета страна
-CashdeskDashboard=Point of sale access
+CashdeskDashboard=Достъп до точка на продажбите
 ShoppingCart=Количка за пазаруване
 NewSell=Нов продажба
 BackOffice=Обратно офис
@@ -36,5 +36,5 @@ BankToPay=Банкова сметка
 ShowCompany=Покажи фирмата
 ShowStock=Покажи склад
 DeleteArticle=Кликнете, за да се премахне тази статия
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Търсене (Номер/Заглавие)
+UserNeedPermissionToEditStockToUsePos=Запитвате за намаляване на стоки при създаване на фактура, така че потребителя използващ ТП трябва да е с привилегии да редактира стоки. 
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -50,7 +50,7 @@ SupplierIsInCategories=Третото лице е в следните катег
 CompanyIsInCustomersCategories=Това трето лице е в следните категории клиенти/prospects
 CompanyIsInSuppliersCategories=Това трето лице е в следните категории доставчици
 MemberIsInCategories=Този член е в следните категории членове
-ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=Този контакт принадлежи на следните категории контакти
 ProductHasNoCategory=Този продукт/услуга не е в никакви категории
 SupplierHasNoCategory=Този доставчик не е в никакви категории
 CompanyHasNoCategory=Тази фирма не е в никакви категории
@@ -66,7 +66,7 @@ ReturnInCompany=Обратно към картата на  клиента/prospe
 ContentsVisibleByAll=Съдържанието ще се вижда от всички
 ContentsVisibleByAllShort=Съдържанието е видимо от всички
 ContentsNotVisibleByAllShort=Съдържанието не е видимо от всички
-CategoriesTree=Categories tree
+CategoriesTree=Категории дърво
 DeleteCategory=Изтриване на категория
 ConfirmDeleteCategory=Сигурни ли сте, че желаете да изтриете тази категория?
 RemoveFromCategory=Премахване на връзката с категория
@@ -96,17 +96,17 @@ CatSupList=Списък на доставчика категории
 CatCusList=Списък на потребителите / перспективата категории
 CatProdList=Списък на продуктите категории
 CatMemberList=Списък на членовете категории
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
+CatContactList=Лист на контактни категории и контакти
+CatSupLinks=Връзки между доставчици и категории
+CatCusLinks=Връзки между потребител/перспектива и категории
+CatProdLinks=Връзки между продукти/услуги и категории
+CatMemberLinks=Връзки между членове и категории
 DeleteFromCat=Премахване от категорията
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
+DeletePicture=Изтрий снимка
+ConfirmDeletePicture=Потвърди изтриване на снимка?
+ExtraFieldsCategories=Допълнителни атрибути
+CategoriesSetup=Категории настройка
+CategorieRecursiv=Автоматично свързване с родителска категория
+CategorieRecursivHelp=Ако е активирано, продукта ще бъде свързан също и с родителската категория при добавяне в под-категория
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show category
--- a/htdocs/langs/bg_BG/commercial.lang
+++ b/htdocs/langs/bg_BG/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Перспектива
 Prospects=Перспективи
 DeleteAction=Изтриване на събитие / задача
 NewAction=Ново събитие/задача
-AddAction=Добавяне на събитие/задача
-AddAnAction=Добавяне на събитие/задача
-AddActionRendezVous=Добави събитие - среща
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
 Rendez-Vous=Среща
 ConfirmDeleteAction=Сигурни ли сте, че желаете да изтриете това събитие/задача?
 CardAction=Карта на/за събитие
@@ -44,8 +44,8 @@ DoneActions=Завършени събития
 DoneActionsFor=Завършени събития за %s
 ToDoActions=Непълни събития
 ToDoActionsFor=Непълни събития за %s
-SendPropalRef=Изпратете търговски %s предложение
-SendOrderRef=Изпрати ред %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
 StatusNotApplicable=Не е приложимо
 StatusActionToDo=За да направите
 StatusActionDone=Пълен
@@ -62,7 +62,7 @@ LastProspectContactDone=Свържи се направи
 DateActionPlanned=Дата на събитието, планирано за
 DateActionDone=Дата на събитието направи
 ActionAskedBy=Събитие докладвани от
-ActionAffectedTo=Събитие засегнати в
+ActionAffectedTo=Event assigned to
 ActionDoneBy=Събитие, извършена от
 ActionUserAsk=Съобщените от
 ErrorStatusCantBeZeroIfStarted=Ако се попълва поле <b>&quot;Дата&quot;,</b> действието се стартира (или завършен), така че <b>&quot;Статус&quot;</b> Полето не може да бъде 0%.
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Изтекла
 ServiceStatusClosed=Затворен
 ServicesLegend=Услуги легенда
 Contracts=Договори
+ContractsAndLine=Contracts and line of contracts
 Contract=Договор
 NoContracts=Не договори
 MenuServices=Услуги
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Терминална команда
 CronMenu=Крон (софтуер за изпънение на автоматични задачи)
 CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Източника и целите на банк
 ErrorBadThirdPartyName=Неправилна стойност за името на трета страна
 ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad синтаксис за код на клиента
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Клиентите изисква код
 ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Клиентът код вече се използва
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript не трябва да бъдат хор
 ErrorPasswordsMustMatch=Двете машинописни пароли трябва да съвпадат помежду си
 ErrorContactEMail=Техническа грешка. Моля, свържете се с администратора след имейл <b>%s</b> EN предоставят на <b>%s</b> код на грешка в съобщението си, или още по-добре чрез добавяне на екран копие на тази страница.
 ErrorWrongValueForField=Грешна стойност за номер на полето <b>%s (&quot;%s&quot;</b> стойността не съответства на регулярни изрази върховенството <b>%s)</b>
-ErrorFieldValueNotIn=Грешна стойност за <b>%s</b> номер на полето (стойност <b>&quot;%s&quot;</b> не е стойност в полеви <b>%s</b> трапезни <b>%s)</b>
+ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
 ErrorFieldRefNotIn=Грешна стойност за номер на полето <b>%s (&quot;%s</b> стойност не е <b>%s</b> съществуващия код)
 ErrorsOnXLines=Грешки на <b>%s</b> изходни линии
 ErrorFileIsInfectedWithAVirus=Антивирусна програма не е в състояние да валидира файла (файл може да бъде заразен с вирус)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action

 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=<strong>Последна стъпка:</strong> Определет
 ActivateModule=Активиране на модул %s
 ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)

 #########
 # upgrade
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -141,6 +141,7 @@ Cancel=Отказ
 Modify=Промяна
 Edit=Редактиране
 Validate=Потвърждение
+ValidateAndApprove=Validate and Approve
 ToValidate=За потвърждение
 Save=Запис
 SaveAs=Запис като
@@ -158,6 +159,7 @@ Search=Търсене
 SearchOf=Търсене
 Valid=Потвърден
 Approve=Одобряване
+Disapprove=Disapprove
 ReOpen=Re-Open
 Upload=Изпращане на файл
 ToLink=Връзка
@@ -219,6 +221,7 @@ Cards=Карти
 Card=Карта
 Now=Сега
 Date=Дата
+DateAndHour=Date and hour
 DateStart=Начална дата
 DateEnd=Крайна дата
 DateCreation=Дата на създаване
@@ -295,6 +298,7 @@ UnitPriceHT=Единична цена (нето)
 UnitPriceTTC=Единична цена
 PriceU=U.P.
 PriceUHT=U.P. (нето)
+AskPriceSupplierUHT=P.U. HT Requested
 PriceUTTC=U.P.
 Amount=Размер
 AmountInvoice=Фактурирана стойност
@@ -521,6 +525,7 @@ DateFromTo=От %s до %s
 DateFrom=От %s
 DateUntil=До %s
 Check=Проверка
+Uncheck=Uncheck
 Internal=Вътрешен
 External=Външен
 Internals=Вътрешен
@@ -688,6 +693,7 @@ PublicUrl=Public URL
 AddBox=Add box
 SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане
 PrintFile=Print File %s
+ShowTransaction=Show transaction
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Отменен
 StatusOrderDraft=Проект (трябва да бъдат валидирани)
 StatusOrderValidated=Утвърден
 StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
 StatusOrderProcessed=Обработен
 StatusOrderToBill=Доставени
 StatusOrderToBill2=На Бил
@@ -58,6 +59,7 @@ MenuOrdersToBill=Доставени поръчки
 MenuOrdersToBill2=Billable orders
 SearchOrder=Търсене за
 SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
 ShipProduct=Кораб продукт
 Discount=Отстъпка
 CreateOrder=Създаване на поръчка
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -54,12 +54,13 @@ MaxSize=Максимален размер
 AttachANewFile=Прикачване на нов файл/документ
 LinkedObject=Свързан обект
 Miscellaneous=Разни
-NbOfActiveNotifications=Брой на уведомленията
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=Това е тестов имейл.\nДвата реда са разделени с нов ред.\n\n__SIGNATURE__
 PredefinedMailTestHtml=Това е <b>тестов</b> имейл (думата тестов трябва да бъде с удебелен шрифт). <br>Двата реда са разделени с нов ред.<br><br> __SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
 l_eatby=Eat-by date
 l_sellby=Sell-by date
 DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Batch: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceMode=Price mode
 PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Всички
 PrivateProject=Контакти на проекта
 MyProjectsDesc=Тази гледна точка е ограничена до проекти, които са за контакт (какъвто и да е тип).
 ProjectsPublicDesc=Този възглед представя всички проекти, по които могат да се четат.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Този възглед представя всички проекти (потребителски разрешения ви даде разрешение да видите всичко).
 MyTasksDesc=Тази гледна точка е ограничена до проекти или задачи, които са контакт (какъвто и да е тип).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Този възглед представя всички проекти и задачи, които може да чете.
 TasksDesc=Този възглед представя всички проекти и задачи (потребителски разрешения ви даде разрешение да видите всичко).
 ProjectsArea=Проекти област
@@ -29,6 +31,8 @@ NoProject=Нито един проект няма определени или с
 NbOpenTasks=Nb отворени задачи
 NbOfProjects=Nb на проекти
 TimeSpent=Времето, прекарано
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
 TimesSpent=Времето, прекарано
 RefTask=Реф. задача
 LabelTask=Label задача
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Списък на поръчките на д
 ListSupplierInvoicesAssociatedProject=Списък на фактурите на доставчика, свързана с проекта
 ListContractAssociatedProject=Списък на договори, свързани с проекта
 ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта
-ListTripAssociatedProject=Списък на пътувания и разходи, свързани с проекта
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
 ActivityOnProjectThisWeek=Дейности в проекта тази седмица
 ActivityOnProjectThisMonth=Дейност по проект, този месец
@@ -133,3 +137,6 @@ SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
 Salary=Заплата
 Salaries=Заплати
 Employee=Служител
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Количество нареди
 QtyShipped=Количество изпратени
 QtyToShip=Количество за кораба
 QtyReceived=Количество получи
-KeepToShip=Придържайте се към кораб
+KeepToShip=Remain to ship
 OtherSendingsForSameOrder=Други пратки за изпълнение на поръчката
 DateSending=Дата на изпращане ред
 DateSendingShort=Дата на изпращане ред
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Средна цена
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Създаване на склада автоматично при създаването на потребителя
+IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Брой изпратени
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decreas
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=За този склад
 ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
 Replenishments=Попълване
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Доставчици
-Supplier=Снабдител
 AddSupplier=Create a supplier
 SupplierRemoved=Изтрити доставчик
 SuppliersInvoice=Фактура
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Фактури и наредби
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Одобряване на поръчката
 ConfirmApproveThisOrder=Сигурен ли сте, че искате да одобри <b>%s Поръчката?</b>
-DenyingThisOrder=Да откаже поръчката
+DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Сигурен ли сте, че искате да откаже доставчик <b>%s</b> за?
 ConfirmCancelThisOrder=Сигурен ли сте, че искате да отмените доставчика на <b>%s</b> за?
 AddCustomerOrder=Създаване на заявка на клиента
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -1,22 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=Екскурзия
-Trips=Екскурзии
-TripsAndExpenses=Екскурзии и разноски
-TripsAndExpensesStatistics=Екскурзии и разходи статистика
-TripCard=Екскурзия карта
-AddTrip=Добави пътуване
-ListOfTrips=Списък на пътуванията
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
 ListOfFees=Списък на такси
-NewTrip=Нов пътуване
+NewTrip=New expense report
 CompanyVisited=Фирмата/организацията е посетена
 Kilometers=Км
 FeesKilometersOrAmout=Сума или км
-DeleteTrip=Изтриване на пътуване
-ConfirmDeleteTrip=Сигурен ли сте, че искате да изтриете това пътуване?
-TF_OTHER=Друг
-TF_LUNCH=Обяд
-TF_TRIP=Екскурзия
-ListTripsAndExpenses=Списък на пътувания и разходи
-ExpensesArea=Екскурзии и разходи площ
-SearchATripAndExpense=Търсене на пътуване и разходи
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
 ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Друг
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Обяд
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Eksperimentalno
 VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
 VersionRecommanded=Preporučeno
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=ID sesije
 SessionSaveHandler=Rukovatelj snimanje sesija
 SessionSavePath=Lokalizacija snimanja sesije
@@ -493,10 +498,16 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
 Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
 Permission183=Validate supplier orders
 Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
 Permission186=Receive supplier orders
 Permission187=Close supplier orders
 Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
+Permission771=Read expense reports (own and his subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
 DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
 ExtraFields=Dopunski atributi
 ExtraFieldsLines=Dopunski atributi (tekstovi)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Dopunski atributi (treća stranka)
 ExtraFieldsContacts=Dopunski atributi (kontakt/adresa)
 ExtraFieldsMember=Dopunski atributi (član)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) 
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### AskPriceSupplier #####
+AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierNumberingModules=Price requests suppliers numbering models
+AskPriceSupplierPDFModules=Price requests suppliers documents models
+FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
+WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Menadžer za automatsko određivanje barkod brojeva
 ##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Default account to use to receive cash payments
 CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
 CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
 IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -33,7 +33,11 @@ AllTime=Od početka
 Reconciliation=Izmirenje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT broj
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
 StandingOrders=Trajni nalozi
 StandingOrder=Trajni nalog
 Withdrawals=Podizanja
@@ -148,7 +152,7 @@ BackToAccount=Nazad na račun
 ShowAllAccounts=Pokaži za sve račune
 FutureTransaction=Transakcije u budućnosti. Nema šanse da se izmiri.
 SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj".
-InputReceiptNumber=Odaberite izvod banke u vezi s izmirenjima. Koristite numeričke vrijednosti (kao što je, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
 ToConciliate=Izmiriti?
 ThenCheckLinesAndConciliate=Zatim, provjerite tekst prisutan u izvodu banke i kliknite
--- a/htdocs/langs/bs_BA/commercial.lang
+++ b/htdocs/langs/bs_BA/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
 Prospects=Prospects
 DeleteAction=Delete an event/task
 NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
 Rendez-Vous=Rendezvous
 ConfirmDeleteAction=Are you sure you want to delete this event/task ?
 CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
 DoneActionsFor=Completed events for %s
 ToDoActions=Incomplete events
 ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
 StatusNotApplicable=Not applicable
 StatusActionToDo=To do
 StatusActionDone=Complete
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Istekao
 ServiceStatusClosed=Zatvoren
 ServicesLegend=Legenda usluga
 Contracts=Ugovori
+ContractsAndLine=Contracts and line of contracts
 Contract=Ugovor
 NoContracts=Nema ugovora
 MenuServices=Usluge
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell komanda
 CronMenu=Cron
 CronCannotLoadClass=Ne može se otvoriti klada %s ili objekat %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
 ErrorBadThirdPartyName=Bad value for third party name
 ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Customer code required
 ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
 ErrorPasswordsMustMatch=Both typed passwords must match each other
 ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> en provide the error code <b>%s</b> in your message, or even better by adding a screen copy of this page.
 ErrorWrongValueForField=Wrong value for field number <b>%s</b> (value '<b>%s</b>' does not match regex rule <b>%s</b>)
-ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b>)
+ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
 ErrorFieldRefNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a <b>%s</b> existing ref)
 ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action

 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=<strong>Last step</strong>: Define here login and password you plan
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)

 #########
 # upgrade
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
 Modify=Modify
 Edit=Edit
 Validate=Validate
+ValidateAndApprove=Validate and Approve
 ToValidate=To validate
 Save=Save
 SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
 SearchOf=Search
 Valid=Valid
 Approve=Approve
+Disapprove=Disapprove
 ReOpen=Re-Open
 Upload=Send file
 ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
 Card=Card
 Now=Now
 Date=Date
+DateAndHour=Date and hour
 DateStart=Date start
 DateEnd=Date end
 DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
 PriceUTTC=U.P.
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
 DateFrom=From %s
 DateUntil=Until %s
 Check=Check
+Uncheck=Uncheck
 Internal=Internal
 External=External
 Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
 AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
+ShowTransaction=Show transaction
 # Week day
 Monday=Monday
 Tuesday=Tuesday
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
 StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
 StatusOrderProcessed=Processed
 StatusOrderToBill=Delivered
 StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
 MenuOrdersToBill2=Billable orders
 SearchOrder=Search order
 SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
 ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
 AttachANewFile=Attach a new file/document
 LinkedObject=Linked object
 Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
 PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
 l_eatby=Eat-by date
 l_sellby=Sell-by date
 DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Batch: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceMode=Price mode
 PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Zajednički projekti
 PrivateProject=Kontakti za projekte
 MyProjectsDesc=Ovaj pregled je limitiran na projekte u kojima ste stavljeni kao kontakt (bilo koji tip).
 ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Ovaj pregled predstavlja sve projekte (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 MyTasksDesc=Ovaj pregled predstavlja sve projekte ili zadatke za koje ste kontakt (bilo koji tip).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
 TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 ProjectsArea=Područje za projekte
@@ -29,6 +31,8 @@ NoProject=Nema definisanog ili vlastitog projekta
 NbOpenTasks=Broj otvorenih zadataka
 NbOfProjects=Broj projekata
 TimeSpent=Vrijeme provedeno
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
 TimesSpent=Vrijeme provedeno
 RefTask=Ref. zadatka
 LabelTask=Oznaka zadatka
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista narudžbi dobavljača u vezi s projekt
 ListSupplierInvoicesAssociatedProject=Lista faktura dobavljača u vezi s projektom
 ListContractAssociatedProject=Lista ugovora u vezi s projektom
 ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
-ListTripAssociatedProject=Lista putovanja i troškove u vezi s projektom
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListActionsAssociatedProject=Lista događaja u vezi s projektom
 ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice
 ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca
@@ -133,3 +137,6 @@ SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
 Salary=Salary
 Salaries=Salaries
 Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Naručena količina
 QtyShipped=Poslana količina
 QtyToShip=Količina za slanje
 QtyReceived=Primljena količina
-KeepToShip=Zadržati za slanje
+KeepToShip=Remain to ship
 OtherSendingsForSameOrder=Druge pošiljke za ovu narudžbu
 DateSending=Datum slanja narudžbe
 DateSendingShort=Datum slanja narudžbe
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Ponderirana/vagana aritmetička sredina - PAS
 PMPValueShort=PAS
 EnhancedValueOfWarehouses=Skladišna vrijednost
 UserWarehouseAutoCreate=Kreiraj skladište automatski prilikom kreiranja korisnika
+IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Otpremljena količina
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladište <b>%s</b> će biti korišteno za smanjenje
 WarehouseForStockIncrease=Skladište <b>%s</b> će biti korišteno za povećanje zalihe
 ForThisWarehouse=Za ovo skladište
 ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=Ovo je lista svih otvorenih narudžbi dobavljača
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
 Replenishments=Nadopune
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Dobavljači
-Supplier=Dobavljač
 AddSupplier=Create a supplier
 SupplierRemoved=Dobavljač uklonjen
 SuppliersInvoice=Faktura dobavljača
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Fakture i plačanja dobavljača
 ExportDataset_fournisseur_3=Narudžbe za dobavljača i tekst narudžbe
 ApproveThisOrder=Odobri ovu narudžbu
 ConfirmApproveThisOrder=Jeste li sigurni da želite da odobriti narudžbu <b>%s</b> ?
-DenyingThisOrder=Odbijanje ove narudžbe
+DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Jeste li sigurni da želite odbiti narudžbu <b>%s</b> ?
 ConfirmCancelThisOrder=Jeste li sigurni da želite poništiti narudžbu <b>%s</b> ?
 AddCustomerOrder=Kreiraj narudžbu za kupca
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -1,22 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=Putovanje
-Trips=Putovanja
-TripsAndExpenses=Putovanja i troškovi
-TripsAndExpensesStatistics=Statistika putovanja i troškova
-TripCard=Kartica putovanja
-AddTrip=Dodaj putovanje
-ListOfTrips=Lista putovanja
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
 ListOfFees=Lista naknada
-NewTrip=Novo putovanje
+NewTrip=New expense report
 CompanyVisited=Posjeta kompaniji/fondaciji
 Kilometers=Kilometri
 FeesKilometersOrAmout=Iznos ili kilometri
-DeleteTrip=Obriši putovanje
-ConfirmDeleteTrip=Jeste li sigurni da želite obrisati ovo putovanje?
-TF_OTHER=Ostalo
-TF_LUNCH=Ručak
-TF_TRIP=Putovanje
-ListTripsAndExpenses=Lista putovanja i troškova
-ExpensesArea=Područje za putovanja i troškove
-SearchATripAndExpense=Traži putovanja i troškove
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
 ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Ostalo
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Ručak
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
 VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
 VersionRecommanded=Recomanada
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=Sesió ID
 SessionSaveHandler=Modalitat de salvaguardat de sessions
 SessionSavePath=Localització salvaguardat de sessions
@@ -493,10 +498,16 @@ Module600Name=Notificacions
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis
 Module1400Name=Comptabilitat experta
 Module1400Desc=Gestió experta de la comptabilitat (doble partida)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
 Module1780Name=Categories
 Module1780Desc=Gestió de categories (productes, proveïdors i clients)
 Module2000Name=Editor WYSIWYG
@@ -631,7 +642,7 @@ Permission181=Consultar comandes a proveïdors
 Permission182=Crear/modificar comandes a proveïdors
 Permission183=Validar comandes a proveïdors
 Permission184=Aprovar comandes a proveïdors
-Permission185=Enviar comandes a proveïdors
+Permission185=Order or cancel supplier orders
 Permission186=Rebre comandes de proveïdors
 Permission187=Tancar comandes a proveïdors
 Permission188=Anul·lar comandes a proveïdors
@@ -711,6 +722,13 @@ Permission538=Exportar serveis
 Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
+Permission771=Read expense reports (own and his subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
 Permission1001=Consultar stocks
 Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Contrasenya del servidor proxy
 DefineHereComplementaryAttributes=Definiu aquí la llista d'atributs addicionals, no disponibles a estàndard, i que vol gestionar per %s.
 ExtraFields=Atributs addicionals
 ExtraFieldsLines=atributs complementaris (línies)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Atributs adicionals (tercers)
 ExtraFieldsContacts=Atributs adicionals (contactes/adreçes)
 ExtraFieldsMember=Atributs complementaris (membres)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nu
 FreeLegalTextOnProposal=Text lliure en pressupostos
 WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### AskPriceSupplier #####
+AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierNumberingModules=Price requests suppliers numbering models
+AskPriceSupplierPDFModules=Price requests suppliers documents models
+FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
+WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
 ##### Orders #####
 OrdersSetup=Configuració del mòdul comandes
 OrdersNumberingModules=Mòduls de numeració de les comandes
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Codis de barra tipus UPC
 BarcodeDescISBN=Codis de barra tipus ISBN
 BarcodeDescC39=Codis de barra tipus C39
 BarcodeDescC128=Codis de barra tipus C128
-GenbarcodeLocation=Eina generació codi de barra en línia de comanda (utilitzat pel motor phpbar per a determinats tipus de codis barra)
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
 CashDeskBankAccountForCheque= Compte per defecte a utilitzar per als cobraments amb xecs
 CashDeskBankAccountForCB= Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Configuració del mòdul Bookmark
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
 IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
 Reconciliation=Conciliació
 RIB=Compte bancari
 IBAN=Identificador IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
 BIC=Identificador BIC/SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
 StandingOrders=Domiciliacions
 StandingOrder=Domiciliació
 Withdrawals=Reintegraments
@@ -148,7 +152,7 @@ BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
 FutureTransaction=Transacció futura. No és possible conciliar.
 SelectChequeTransactionAndGenerate=Seleccioneu/filtreu els xecs a incloure a la remesa i feu clic a "Crear".
-InputReceiptNumber=Indiqui l'extracte bancari relacionat amb la conciliació. Utilitzeu un valor numèric ordenable (per exemple, AAAAMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
 ToConciliate=A conciliar?
 ThenCheckLinesAndConciliate=A continuació, comproveu les línies presents en l'extracte bancari i feu clic
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Client potencial
 Prospects=Clients potencials
 DeleteAction=Eliminar un esdeveniment
 NewAction=Nou esdeveniment
-AddAction=Crear esdeveniment
-AddAnAction=Crear un esdeveniment
-AddActionRendezVous=Crear una cita
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
 Rendez-Vous=Cita
 ConfirmDeleteAction=Esteu segur de voler eliminar aquest esdeveniment?
 CardAction=Fitxa esdeveniment
@@ -44,8 +44,8 @@ DoneActions=Llista d'esdeveniments realitzats
 DoneActionsFor=Llista d'esdeveniments realitzats per %s
 ToDoActions=Llista d'esdevenimentss incomplets
 ToDoActionsFor=Llista d'esdeveniments incomplets %s
-SendPropalRef=Enviament del pressupost %s
-SendOrderRef=Enviament de la comanda %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
 StatusNotApplicable=No aplicable
 StatusActionToDo=A realitzar
 StatusActionDone=Realitzat
@@ -62,7 +62,7 @@ LastProspectContactDone=Clients potencials contactats
 DateActionPlanned=Data planificació
 DateActionDone=Data realització
 ActionAskedBy=Acció registrada per
-ActionAffectedTo=Acció assignada a
+ActionAffectedTo=Event assigned to
 ActionDoneBy=Acció realitzada per
 ActionUserAsk=Registrada per
 ErrorStatusCantBeZeroIfStarted=Si el camp '<b>Data de realització</b>' conté dades l'acció està en curs, per la qual cosa el camp 'Estat' no pot ser 0%%.
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirat
 ServiceStatusClosed=Tancat
 ServicesLegend=Llegenda per als serveis
 Contracts=Contractes
+ContractsAndLine=Contracts and line of contracts
 Contract=Contracte
 NoContracts=Sense contractes
 MenuServices=Serveis
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Comando Shell
 CronMenu=Cron
 CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=El compte origen i destinació han de ser diferen
 ErrorBadThirdPartyName=Nom de tercer incorrecte
 ErrorProdIdIsMandatory=El %s es obligatori
 ErrorBadCustomerCodeSyntax=La sintaxi del codi client és incorrecta
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Codi client obligatori
 ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Codi de client ja utilitzat
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opc
 ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre
 ErrorContactEMail=S'ha produït un error tècnic. Contacti amb l'administrador al e-mail <b>%s</b>, indicant el codi d'error <b>%s</b> en el seu missatge, o pot també adjuntar una còpia de pantalla d'aquesta pàgina.
 ErrorWrongValueForField=Valor incorrecte per al camp número <b>%s</b> (el valor '<b>%s</b>' no compleix amb la regla <b>%s</b>)
-ErrorFieldValueNotIn=Valor incorrecte per al camp nombre <b>%s</b> (el valor '<b>%s</b>' no es un valor en el camp <b>%s</b> de la taula <b>%s</b>)
+ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
 ErrorFieldRefNotIn=Valor incorrecte per al camp nombre <b>%s</b> (el valor '<b>%s</b>' no és una referència existent en <b>%s</b>)
 ErrorsOnXLines=Errors a <b>%s</b> línies font
 ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)!
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action

 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=<strong>Últim pas</strong>: Indiqueu aquí el compte i la contrase
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)

 #########
 # upgrade
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -141,6 +141,7 @@ Cancel=Anul·lar
 Modify=Modificar
 Edit=Editar
 Validate=Validar
+ValidateAndApprove=Validate and Approve
 ToValidate=A validar
 Save=Gravar
 SaveAs=Gravar com
@@ -158,6 +159,7 @@ Search=Cercar
 SearchOf=Cerca de
 Valid=Validar
 Approve=Aprovar
+Disapprove=Disapprove
 ReOpen=Reobrir
 Upload=Enviar arxiu
 ToLink=Link
@@ -219,6 +221,7 @@ Cards=Fitxes
 Card=Fitxa
 Now=Ara
 Date=Data
+DateAndHour=Date and hour
 DateStart=Data inici
 DateEnd=Data fi
 DateCreation=Data de creació
@@ -295,6 +298,7 @@ UnitPriceHT=Preu base
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
+AskPriceSupplierUHT=P.U. HT Requested
 PriceUTTC=P.U. Total
 Amount=Import
 AmountInvoice=Import factura
@@ -521,6 +525,7 @@ DateFromTo=De %s a %s
 DateFrom=A partir de %s
 DateUntil=Fins %s
 Check=Verificar
+Uncheck=Uncheck
 Internal=Intern
 External=Extern
 Internals=Interns
@@ -688,6 +693,7 @@ PublicUrl=Public URL
 AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
+ShowTransaction=Show transaction
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Anul-lada
 StatusOrderDraft=Esborrany (a validar)
 StatusOrderValidated=Validada
 StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
 StatusOrderProcessed=Processada
 StatusOrderToBill=Emès
 StatusOrderToBill2=A facturar
@@ -58,6 +59,7 @@ MenuOrdersToBill=Comandes a facturar
 MenuOrdersToBill2=Billable orders
 SearchOrder=Cercar una comanda
 SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
 ShipProduct=Enviar producte
 Discount=Descompte
 CreateOrder=Crear comanda
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -54,12 +54,13 @@ MaxSize=Tamany màxim
 AttachANewFile=Adjuntar nou arxiu/document
 LinkedObject=Objecte adjuntat
 Miscellaneous=Diversos
-NbOfActiveNotifications=Número notificacions
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=Això és un correu de prova.\nLes 2 línies estan separades per un retorn de carro a la línia.
 PredefinedMailTestHtml=Això és un e-mail de <b>prova</b> (la paraula prova ha d'estar en negreta).<br>Les 2 línies estan separades per un retorn de carro en la línia
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
 l_eatby=Eat-by date
 l_sellby=Sell-by date
 DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Batch: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceMode=Price mode
 PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Projecte compartit
 PrivateProject=Contactes del projecte
 MyProjectsDesc=Aquesta vista projecte es limita als projectes en què vostè és un contacte afectat (qualsevol tipus).
 ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa).
 MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és un contacte afectat en almenys una tasca (qualsevol tipus).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
 TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa).
 ProjectsArea=Àrea projectes
@@ -29,6 +31,8 @@ NoProject=Cap projecte definit
 NbOpenTasks=Nº Tasques obertes
 NbOfProjects=Nº de projectes
 TimeSpent=Temps dedicat
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
 TimesSpent=Temps dedicats
 RefTask=Ref. tasca
 LabelTask=Etiqueta tasca
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Llistat de comandes a proveïdors associades
 ListSupplierInvoicesAssociatedProject=Llistat de factures de proveïdor associades al projecte
 ListContractAssociatedProject=Llistatde contractes associats al projecte
 ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte
-ListTripAssociatedProject=Llistat notes d'honoraris associades al projecte
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte
 ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana
 ActivityOnProjectThisMonth=Activitat en el projecte aquest mes
@@ -133,3 +137,6 @@ SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -1,8 +1,13 @@
 # Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+Salary=Sou
+Salaries=Sous
+Employee=Empleat
+NewSalaryPayment=Nou pagament de sous
+SalaryPayment=Pagament de sous
+SalariesPayments=Pagaments de sous
+ShowSalaryPayment=Veure pagament de sous
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qt. demanada
 QtyShipped=Qt. enviada
 QtyToShip=Qt. a enviar
 QtyReceived=Qt. rebuda
-KeepToShip=Quede per enviar
+KeepToShip=Remain to ship
 OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda
 DateSending=Data d'expedició
 DateSendingShort=Data d'expedició
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor d'estocs
 UserWarehouseAutoCreate=Crea automàticament existències/magatzem propi de l'usuari en la creació de l'usuari
+IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantitat desglossada
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decreas
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
 ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Proveïdors
-Supplier=Proveïdor
 AddSupplier=Create a supplier
 SupplierRemoved=Proveïdor eliminat
 SuppliersInvoice=Factura proveïdor
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Factures proveïdors i pagaments
 ExportDataset_fournisseur_3=Comandes de proveïdors i línies de comanda
 ApproveThisOrder=Aprovar aquesta comanda
 ConfirmApproveThisOrder=Esteu segur de voler aprovar la comanda a proveïdor <b>%s</b>?
-DenyingThisOrder=Denegar aquesta comanda
+DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Esteu segur de voler denegar la comanda a proveïdor <b>%s</b>?
 ConfirmCancelThisOrder=Esteu segur de voler cancel·lar la comanda a proveïdor <b>%s</b>?
 AddCustomerOrder=Crear comanda de client
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -1,22 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=Desplaçament
-Trips=Desplaçaments
-TripsAndExpenses=Honoraris
-TripsAndExpensesStatistics=Estadístiques honoraris
-TripCard=Fitxa honorari
-AddTrip=Crear honorari
-ListOfTrips=Llistat de honorari
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
 ListOfFees=Llistat notes de honoraris
-NewTrip=Nou honorari
+NewTrip=New expense report
 CompanyVisited=Empresa/institució visitada
 Kilometers=Quilòmetres
 FeesKilometersOrAmout=Import o quilòmetres
-DeleteTrip=Eliminar honorari
-ConfirmDeleteTrip=Esteu segur de voler eliminar aquest honorari?
-TF_OTHER=Altre
-TF_LUNCH=Dieta
-TF_TRIP=Viatge
-ListTripsAndExpenses=Llistat notes de honoraris
-ExpensesArea=Àrea Notes d'honoraris
-SearchATripAndExpense=Cercar un honorari
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
 ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Altre
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Dieta
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimentální
 VersionDevelopment=Vývoj
 VersionUnknown=Neznámý
 VersionRecommanded=Doporučené
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=ID relace
 SessionSaveHandler=Manipulátor uložených relací
 SessionSavePath=Místo uložení relace
@@ -493,10 +498,16 @@ Module600Name=Upozornění
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Dary
 Module700Desc=Darování řízení
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integrace
 Module1400Name=Účetnictví
 Module1400Desc=Vedení účetnictví (dvojité strany)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
 Module1780Name=Kategorie
 Module1780Desc=Category management (produkty, dodavatelé a odběratelé)
 Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Přečtěte si dodavatelských objednávek
 Permission182=Vytvořit / upravit dodavatelské objednávky
 Permission183=Ověřit dodavatelských objednávek
 Permission184=Schválit dodavatelských objednávek
-Permission185=Objednávky Objednat dodavatel
+Permission185=Order or cancel supplier orders
 Permission186=Příjem objednávek s dodavately
 Permission187=Zavřít dodavatelské objednávky
 Permission188=Zrušit dodavatelských objednávek
@@ -711,6 +722,13 @@ Permission538=Export služeb
 Permission701=Přečtěte si dary
 Permission702=Vytvořit / upravit dary
 Permission703=Odstranit dary
+Permission771=Read expense reports (own and his subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
 Permission1001=Přečtěte si zásoby
 Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Heslo používat proxy server
 DefineHereComplementaryAttributes=Definujte zde všechny atributy, které ještě nejsou k dispozici ve výchozím nastavení, a že chcete být podporovány %s.
 ExtraFields=Doplňkové atributy
 ExtraFieldsLines=Doplňkové atributy (linky)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Doplňkové atributy (thirdparty)
 ExtraFieldsContacts=Doplňkové atributy (kontakt / adresa)
 ExtraFieldsMember=Doplňkové atributy (člen)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Řada výrobků / služeb s nulové hodnoty je považo
 FreeLegalTextOnProposal=Volný text o obchodních návrhů
 WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### AskPriceSupplier #####
+AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierNumberingModules=Price requests suppliers numbering models
+AskPriceSupplierPDFModules=Price requests suppliers documents models
+FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
+WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
 ##### Orders #####
 OrdersSetup=Objednat řízení nastavení
 OrdersNumberingModules=Objednávky číslování modelů
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Čárových kódů typu UPC
 BarcodeDescISBN=Čárový kód typu ISBN
 BarcodeDescC39=Čárový kód typu C39
 BarcodeDescC128=Čárový kód typu C128
-GenbarcodeLocation=Bar generování kódu nástroj pro příkazovou řádku (používaný motorem s vnitřním u některých typů čárových kódů)
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Vnitřní motor
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Výchozí účet použít pro příjem plateb v hotovosti
 CashDeskBankAccountForCheque= Výchozí účet použít pro příjem plateb šekem
 CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostřednictvím kreditní karty
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Záložka Nastavení modulu
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
 IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
 Reconciliation=Smíření
 RIB=Číslo bankovního účtu
 IBAN=IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT číslo
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
 StandingOrders=Trvalé příkazy
 StandingOrder=Trvalý příkaz
 Withdrawals=Výběry
@@ -148,7 +152,7 @@ BackToAccount=Zpět na účtu
 ShowAllAccounts=Zobrazit pro všechny účty
 FutureTransaction=Transakce v Futur. Žádný způsob, jak se smířit.
 SelectChequeTransactionAndGenerate=Výběr / filtr, aby kontroly zahrnovaly do obdržení šeku vkladů a klikněte na &quot;Vytvořit&quot;.
-InputReceiptNumber=Vyberte si výpis z účtu související s dohodovacím řízení. Použijte Sortable číselnou hodnotu (například RRRRMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Nakonec určit kategorii, ve které chcete klasifikovat záznamy
 ToConciliate=Smířit?
 ThenCheckLinesAndConciliate=Poté zkontrolujte, zda řádky, které jsou ve výpisu z účtu a klepněte na tlačítko
--- a/htdocs/langs/cs_CZ/commercial.lang
+++ b/htdocs/langs/cs_CZ/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Vyhlídka
 Prospects=Vyhlídky
 DeleteAction=Odstranit událost / úkol
 NewAction=Nová událost / úkol
-AddAction=Přidat událost / úkol
-AddAnAction=Přidat událost / úkol
-AddActionRendezVous=Přidat Rendez-vous události
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
 Rendez-Vous=Schůzka
 ConfirmDeleteAction=Jste si jisti, že chcete smazat tuto událost / úkol?
 CardAction=Událost karty
@@ -44,8 +44,8 @@ DoneActions=Dokončené akce
 DoneActionsFor=Dokončené akce pro %s
 ToDoActions=Neúplné události
 ToDoActionsFor=Neúplné akce pro %s
-SendPropalRef=Poslat komerční návrhu %s
-SendOrderRef=Pošli objednávku %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
 StatusNotApplicable=Nevztahuje se
 StatusActionToDo=Chcete-li
 StatusActionDone=Dokončit
@@ -62,7 +62,7 @@ LastProspectContactDone=Spojit se provádí
 DateActionPlanned=Datum Akce plánované na
 DateActionDone=Datum Akce provedeno
 ActionAskedBy=Akce hlášeny
-ActionAffectedTo=Událost přiřazena
+ActionAffectedTo=Event assigned to
 ActionDoneBy=Událost provádí
 ActionUserAsk=Zpracoval
 ErrorStatusCantBeZeroIfStarted=Pokud pole <b>'Datum udělat</b> &quot;je naplněn, je akce zahájena (nebo dokončený), tak pole&quot; <b>Stav</b> &quot;nemůže být 0%%.
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Vypršela
 ServiceStatusClosed=Zavřeno
 ServicesLegend=Služby legenda
 Contracts=Smlouvy
+ContractsAndLine=Contracts and line of contracts
 Contract=Smlouva
 NoContracts=Žádné smlouvy
 MenuServices=Služby
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell příkaz
 CronMenu=Cron
 CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
 UseMenuModuleToolsToAddCronJobs=Jděte do menu &quot;Home - Moduly nářadí - Seznam úloh&quot; vidět a upravovat naplánované úlohy.
+TaskDisabled=Task disabled
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Zdrojové a cílové bankovní účty musí být
 ErrorBadThirdPartyName=Nesprávná hodnota pro třetí strany jménem
 ErrorProdIdIsMandatory=%s je povinné
 ErrorBadCustomerCodeSyntax=Bad syntaxe pro zákazníka kódu
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Zákazník požadoval kód
 ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Zákaznický kód již používán
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript musí být vypnuta, že tato funkce prac
 ErrorPasswordsMustMatch=Oba napsaný hesla se musí shodovat se navzájem
 ErrorContactEMail=Technické chybě. Prosím, obraťte se na správce, aby e-mailovou <b>%s</b> en poskytovat <b>%s</b> kód chyby ve zprávě, nebo ještě lépe přidáním obrazovky kopii této stránky.
 ErrorWrongValueForField=Chybná hodnota <b>%s</b> číslo pole (hodnota <b>&quot;%s</b> 'neodpovídá regex pravidel <b>%s)</b>
-ErrorFieldValueNotIn=Chybná hodnota <b>%s</b> číslo pole (hodnota <b>&quot;%s</b> 'není dostupná hodnota do pole <b>%s</b> stolních <b>%s)</b>
+ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
 ErrorFieldRefNotIn=Chybná hodnota <b>%s</b> číslo pole (hodnota <b>&quot;%s&quot;</b> není <b>%s</b> stávající ref)
 ErrorsOnXLines=Chyby na <b>%s</b> zdrojovém záznamu (s)
 ErrorFileIsInfectedWithAVirus=Antivirový program nebyl schopen ověřit soubor (soubor může být napaden virem)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action

 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=<strong>Poslední krok:</strong> Definujte zde přihlašovací jmé
 ActivateModule=Aktivace modulu %s
 ShowEditTechnicalParameters=Klikněte zde pro zobrazení / editaci pokročilých parametrů (pro experty)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)

 #########
 # upgrade
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -141,6 +141,7 @@ Cancel=Zrušit
 Modify=Upravit
 Edit=Upravit
 Validate=Potvrdit
+ValidateAndApprove=Validate and Approve
 ToValidate=Chcete-li ověřit
 Save=Uložit
 SaveAs=Uložit jako
@@ -158,6 +159,7 @@ Search=Vyhledávání
 SearchOf=Vyhledávání
 Valid=Platný
 Approve=Schvalovat
+Disapprove=Disapprove
 ReOpen=Znovu otevřít
 Upload=Odeslat soubor
 ToLink=Link
@@ -219,6 +221,7 @@ Cards=Karty
 Card=Karta
 Now=Nyní
 Date=Datum
+DateAndHour=Date and hour
 DateStart=Datum začátku
 DateEnd=Datum ukončení
 DateCreation=Datum vytvoření
@@ -295,6 +298,7 @@ UnitPriceHT=Jednotková cena (bez DPH)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
+AskPriceSupplierUHT=P.U. HT Requested
 PriceUTTC=UP
 Amount=Množství
 AmountInvoice=Fakturovaná částka
@@ -521,6 +525,7 @@ DateFromTo=Od %s na %s
 DateFrom=Od %s
 DateUntil=Do %s
 Check=Kontrola
+Uncheck=Uncheck
 Internal=Vnitřní
 External=Externí
 Internals=Vnitřní
@@ -688,6 +693,7 @@ PublicUrl=Public URL
 AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
+ShowTransaction=Show transaction
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Zrušený
 StatusOrderDraft=Návrh (musí být ověřena)
 StatusOrderValidated=Ověřené
 StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
 StatusOrderProcessed=Zpracované
 StatusOrderToBill=Dodává se
 StatusOrderToBill2=K účtu
@@ -58,6 +59,7 @@ MenuOrdersToBill=Objednávky dodáno
 MenuOrdersToBill2=Billable orders
 SearchOrder=Hledat účelem
 SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
 ShipProduct=Loď produkt
 Discount=Sleva
 CreateOrder=Vytvořit objednávku
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximální rozměr
 AttachANewFile=Připojte nový soubor / dokument
 LinkedObject=Propojený objekt
 Miscellaneous=Smíšený
-NbOfActiveNotifications=Počet oznámení
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=Toto je test e-mailem. \\ NPokud dva řádky jsou odděleny znakem konce řádku. \n\n __ SIGNATURE__
 PredefinedMailTestHtml=Toto je <b>test-mail</b> (slovo test musí být tučně). <br> Dva řádky jsou odděleny znakem konce řádku. <br><br> __SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
 l_eatby=Eat-by date
 l_sellby=Sell-by date
 DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Batch: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceMode=Price mode
 PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Všichni
 PrivateProject=Kontakty na projektu
 MyProjectsDesc=Tento pohled je omezen na projekty u kterých jste uveden jako kontakt (jakéhokoliv typu)
 ProjectsPublicDesc=Tento pohled zobrazuje všechny projekty které máte oprávnění číst.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Tento pohled zobrazuje všechny projekty (vaše uživatelské oprávnění vám umožňuje vidět vše).
 MyTasksDesc=Tento pohled je omezen na projekty či úkoly u kterých jste uveden jako kontakt (jakéhokoliv typu)
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte oprávnění číst.
 TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské oprávnění vám umožňuje vidět vše).
 ProjectsArea=Projekty
@@ -29,6 +31,8 @@ NoProject=Žádný projekt nedefinován či vlastněn
 NbOpenTasks=Počet otevřených úloh
 NbOfProjects=Počet projektů
 TimeSpent=Strávený čas
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
 TimesSpent=Strávený čas
 RefTask=Číslo. úkolu
 LabelTask=Název úkolu
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Seznam dodavatelských objednávek souvisej
 ListSupplierInvoicesAssociatedProject=Seznam dodavatelských faktur související s projektem
 ListContractAssociatedProject=Seznam zakázek souvisejících s projektem
 ListFichinterAssociatedProject=Seznam zákroků spojených s projektem
-ListTripAssociatedProject=Seznam cest a nákladů spojených s projektem
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListActionsAssociatedProject=Seznam událostí spojených s projektem
 ActivityOnProjectThisWeek=Týdenní projektová aktivita
 ActivityOnProjectThisMonth=Měsíční projektová aktivita
@@ -133,3 +137,6 @@ SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
--- a/Show More
+++ b/Show More